diff --git a/alex/home.nix b/alex/home.nix index 983e222..d576311 100644 --- a/alex/home.nix +++ b/alex/home.nix @@ -28,6 +28,16 @@ yt-dlp ]; + # WM/DE config + gtk = { + enable = true; + font.name = "Victor Mono SemiBold 12"; + theme = { + name = "SolArc-Dark"; + package = pkgs.solarc-gtk-theme; + }; + }; + # User software configurations programs = { git = { @@ -83,6 +93,7 @@ # the Home Manager release notes for a list of state version # changes in each release. home.stateVersion = "23.05"; + home.enableNixpkgsReleaseCheck = true; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/flake.lock b/flake.lock index d70cd6c..b8e2480 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "atau-nixpkgs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687128134, + "narHash": "sha256-6O3MUIm5dJMRUw4VxYQFtTvnvemzS59HMyulZ5TEqCg=", + "ref": "main", + "rev": "b8db8ac34275a625ac6f6f51ad435227526d54f0", + "revCount": 4, + "type": "git", + "url": "https://git.atauno.com/atau/atau-nixpkgs" + }, + "original": { + "ref": "main", + "rev": "b8db8ac34275a625ac6f6f51ad435227526d54f0", + "type": "git", + "url": "https://git.atauno.com/atau/atau-nixpkgs" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -39,6 +61,7 @@ }, "root": { "inputs": { + "atau-nixpkgs": "atau-nixpkgs", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 883f2d3..f9873c8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,24 +3,39 @@ inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; + + atau-nixpkgs.url = "git+https://git.atauno.com/atau/atau-nixpkgs?ref=main&rev=b8db8ac34275a625ac6f6f51ad435227526d54f0"; + atau-nixpkgs.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ nixpkgs, home-manager, ... }: { - nixosConfigurations.nixos76 = nixpkgs.lib.nixosSystem { + outputs = inputs@{ nixpkgs, atau-nixpkgs, home-manager, ... }: + let system = "x86_64-linux"; - modules = [ - ./system/configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.alex = import ./alex/home.nix; - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } - ]; + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + # note: atau-nixpkgs currently only provides the `theme-platinum9` package which is broken due to gtk2 being unsupported in newer xfce + overlays = [ atau-nixpkgs.overlay ]; + }; + in + { + nixosConfigurations.nixos76 = nixpkgs.lib.nixosSystem { + inherit pkgs; + inherit system; + modules = [ + ./system/configuration.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.alex = import ./alex/home.nix; + # Optionally, use home-manager.extraSpecialArgs to pass + # arguments to home.nix + } + ]; + }; }; - }; }