Compare commits

..

No commits in common. "73aa1201287db34f61f6ae5381e0b2c595e22d35" and "c457bb31dfa0d60f469874ae8fbf2c1689ce7255" have entirely different histories.

6 changed files with 73 additions and 71 deletions

View File

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968822, "lastModified": 1729527199,
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1731038603, "lastModified": 1730779403,
"narHash": "sha256-4eJQfKZnMwy7Y2bFHqw/mpZjsPWrXfITmgTLPGmfl/w=", "narHash": "sha256-t7ETd4mv+rWxNgpcUgMhxQbu0kr1CIqJdFMqcagtwF8=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "674763b3eb6f0bdfa1f987984711bd3f33efc7bf", "rev": "b3b25318182d5edf5dcbd5f5207787445b76ebf7",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -252,11 +252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730837930, "lastModified": 1730633670,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1730969692, "lastModified": 1730800743,
"narHash": "sha256-4Ly9zkqnRB6qLjMeddfUyd4iRLvq+RDspBWABS8DGN4=", "narHash": "sha256-DmlaerjZowNAc/NCrVHKwvAMBJYPVFx4YLs0Ad2Jo5g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", "rev": "e3882b23d09aad7f5c3a708536c87b062f3b0d8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +408,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968903, "lastModified": 1728941256,
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1730531603,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +464,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1720386169,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,11 +480,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1730531603,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +537,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1730814269, "lastModified": 1729104314,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +577,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1731002033, "lastModified": 1729963473,
"narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "f71c2effed1ce4f9fbeefe402e4e431428ffe93a", "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,4 +1,6 @@
{ {
inputs,
pkgs,
lib, lib,
config, config,
... ...

View File

@ -1,34 +0,0 @@
{
lib,
pkgs,
config,
...
}: {
options = {
applications.enable = lib.mkEnableOption "enable Graphical applications";
};
imports = [
./applications/firefox.nix
];
config = lib.mkIf config.applications.enable {
home.packages = with pkgs; [
librewolf
vesktop
ferdium
stellarium
libreoffice
localsend
plasma5Packages.kdeconnect-kde
qbittorrent
vlc
#tor-browser
openrocket
spotify
spotube
inkscape
];
};
}

View File

@ -7,20 +7,56 @@
./programming/programming.nix ./programming/programming.nix
./games.nix ./games.nix
./terminal_tools.nix ./terminal_tools.nix
./applications.nix ./applications/firefox.nix
#./packages/applications.nix
]; ];
terminal_tools.enable = lib.mkDefault true; terminal_tools.enable = lib.mkDefault true;
programming.enable = lib.mkDefault true; programming.enable = lib.mkDefault true;
games.enable = lib.mkDefault false; games.enable = lib.mkDefault false;
firefox.enable = lib.mkDefault true; firefox.enable = lib.mkDefault true;
applications.enable = lib.mkDefault true;
#programs.neovim.enable = true; #programs.neovim.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
librewolf
vesktop
ferdium
alejandra alejandra
nh nh
nixd nixd
stellarium
libreoffice
localsend
plasma5Packages.kdeconnect-kde
qbittorrent
vlc
#tor-browser
openrocket
spotify
spotube
inkscape
#zed-editor
#gtk3
#(python3.withPackages (subpkgs: with subpkgs; [
#pygobject3
#gobject-introspection
#astropy
#tomli
#tomli-w
#matplotlib
#basemap
#opencv4
#requests
#]))
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
]; ];
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:

View File

@ -11,8 +11,6 @@
config = lib.mkIf config.vscode.enable { config = lib.mkIf config.vscode.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
vscode vscode
python3
dotnet-sdk_8
]; ];
programs.vscode = { programs.vscode = {
@ -43,7 +41,6 @@
"[python]" = { "[python]" = {
"editor.defaultFormatter" = "ms-python.black-formatter"; "editor.defaultFormatter" = "ms-python.black-formatter";
}; };
"python.defaultInterpreterPath" = "${pkgs.python3}";
"nix.serverPath" = "nixd"; "nix.serverPath" = "nixd";
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.serverSettings" = { "nix.serverSettings" = {

View File

@ -24,6 +24,7 @@
neovim neovim
arduino-ide arduino-ide
go go
dotnet-sdk_8
jq jq
conda conda
]; ];