diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..8392d15 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake \ No newline at end of file diff --git a/flake.lock b/flake.lock index d4db555..7e001dd 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762267440, - "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8dd85bb..b0ea5e1 100755 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,7 @@ }; #TODO this is probably unsupported - shells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system} // outputs.packages.${system} // outputs.azos-packages.${system};})); + #TODO the devshells do not know of the new packages. + devShells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system}; })); }; } diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 9705d74..fb49f22 100755 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -13,5 +13,6 @@ ./discord.nix ./spotify.nix ./headphones-whmx4000.nix + ./deluge.nix ]; } diff --git a/modules/home-manager/deluge.nix b/modules/home-manager/deluge.nix new file mode 100755 index 0000000..79ad022 --- /dev/null +++ b/modules/home-manager/deluge.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + pkgs, + ... +}: let + isEnabled = + config.azos.deluged.enable; +in { + options.azos.deluged.enable = lib.mkOption { + default = true; + example = true; + type = lib.types.bool; + }; + + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ + deluged + ]; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d2e6cd6..8f607b8 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -25,7 +25,7 @@ outputs.overlays.addpkgs inputs.azos-core.overlays.qutebrowserdrm outputs.overlays.modifications - outputs.overlays.unstable-packages + # outputs.overlays.unstable-packages ]; config = { allowUnfree = true; @@ -111,5 +111,5 @@ systemd.targets.hibernate.enable = false; systemd.targets.hybrid-sleep.enable = false; - system.stateVersion = "24.11"; # Did you read the comment? + system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/nixos/lauretta-hardware-configuration.nix b/nixos/lauretta-hardware-configuration.nix index f5e4e92..0d3e60b 100755 --- a/nixos/lauretta-hardware-configuration.nix +++ b/nixos/lauretta-hardware-configuration.nix @@ -17,7 +17,7 @@ boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = []; - fileSystems."/" = { + fileSystems."/" ={ device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7"; fsType = "btrfs"; options = ["subvol=@"]; diff --git a/shells/default.nix b/shells/default.nix index a46e351..56a107d 100755 --- a/shells/default.nix +++ b/shells/default.nix @@ -1,3 +1,5 @@ {pkgs} @ args: { - debugTex = import ./debugTex args; + #TODO since I do not pass along packages, this cannot work + # debugTex = import ./debugTex args; + default = import ./defaultShell.nix args; } diff --git a/shells/defaultShell.nix b/shells/defaultShell.nix new file mode 100644 index 0000000..ea9a780 --- /dev/null +++ b/shells/defaultShell.nix @@ -0,0 +1,15 @@ +{pkgs} @ args: + pkgs.mkShell { + buildInputs = with pkgs; [ + ( pkgs.writeShellScriptBin + "azos-lauretta-update" + "sudo nixos-rebuild switch --flake '.?submodules=1#lauretta'" ) + ( pkgs.writeShellScriptBin + "azos-update-azos-core" + "nix flake lock --update-input azos-core" ) + + ( pkgs.writeShellScriptBin + "azos-update" + "nix flake update" ) + ]; + }