diff --git a/nixos/base.nix b/nixos/base.nix index 046c3cd..c946927 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -1,8 +1,7 @@ -{ config, lib, pkgs, home-manager, ... }: +{ config, lib, pkgs, ... }: { imports = [ ./packages.nix - home-manager.nixosModules.home-manager ]; nix.settings.experimental-features = ["nix-command" "flakes"]; @@ -79,7 +78,5 @@ shell = pkgs.fish; }; - home-manager.users.rae = import ./home.nix; - system.copySystemConfiguration = true; } diff --git a/nixos/flake.lock b/nixos/flake.lock index c931480..0c367ec 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -22,16 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734469883, + "narHash": "sha256-VILvYFwvFbW040V1QECCT+FuwRN14xjtDUcIrod3n2E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d2ac8a404cf537ec5cfc96f4388d7031e6aeb94f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/nixos/flake.nix b/nixos/flake.nix index fc8b55d..5aa2f8c 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,27 +2,29 @@ description = "rae's nixOS config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/release-24.11"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs@{ self, nixpkgs, home-manager, ... }: { + outputs = { self, nixpkgs, home-manager, ... }@inputs: { nixosConfigurations = { - qemu = nixpkgs.lib.nixosSystem { + gayfurries = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ ./hosts/qemu/configuration.nix - # home-manager.nixosModules.home-manager { - # home-manager = { - # useGlobalPkgs = true; - # useUserPackages = true; - # users.rae = import ./home.nix; - # }; - # } + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.rae = import ./home.nix; + }; + } ]; }; }; diff --git a/nixos/home.nix b/nixos/home.nix index 83152c1..4367a06 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -126,21 +126,21 @@ }; }; - dconf.settings = { - "net/launchpad/plank/docks/dock1" = { - dock-items = ["firefox.dockitem" "io.elementary.terminal.dockitem" "codium.dockitem" "io.elementary.settings.dockitem"]; - }; - "org/gnome/desktop/background" = { - picture-uri = "file://" + builtins.toString /home/rae/.dotfiles/assets/wallpapers/kendal.png; - }; - "org/gnome/desktop/wm/preferences" = { - button-layout = ":minimize,maximize,close"; - }; - }; + # dconf.settings = { + # "net/launchpad/plank/docks/dock1" = { + # dock-items = ["firefox.dockitem" "io.elementary.terminal.dockitem" "codium.dockitem" "io.elementary.settings.dockitem"]; + # }; + # "org/gnome/desktop/background" = { + # picture-uri = "file://" + builtins.toString /home/rae/.dotfiles/assets/wallpapers/kendal.png; + # }; + # "org/gnome/desktop/wm/preferences" = { + # button-layout = ":minimize,maximize,close"; + # }; + # }; - gtk = { - enable = true; - cursorTheme.name = "Posy's Cursor"; - theme.name = "io.elementary.stylesheet.blueberry"; - }; + # gtk = { + # enable = true; + # cursorTheme.name = "Posy's Cursor"; + # theme.name = "io.elementary.stylesheet.blueberry"; + # }; }