diff --git a/flake.lock b/flake.lock index 6d83f6f..bdb26bf 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,90 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1783570805, + "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -38,7 +122,83 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "host": "gitlab.gnome.org", + "lastModified": 1776175984, + "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca", + "type": "gitlab" + }, + "original": { + "host": "gitlab.gnome.org", + "owner": "GNOME", + "ref": "50.1", + "repo": "gnome-shell", + "type": "gitlab" + } + }, "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1792098797, + "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "640725978b99076e18e069f6e7d2959124584f8f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixcord", @@ -119,7 +279,7 @@ }, "nixcord": { "inputs": { - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" @@ -199,14 +359,154 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1785549842, + "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=", + "owner": "nix-community", + "repo": "NUR", + "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "flake-parts": "flake-parts", + "home-manager": "home-manager", "import-tree": "import-tree", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "stylix": "stylix" + } + }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-parts": "flake-parts_2", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1791574276, + "narHash": "sha256-UMnLnZ3JlA7UTBNNNx1rNsXYoPP/cirXLCKGiQ/yDx8=", + "owner": "nix-community", + "repo": "stylix", + "rev": "2856c4c6a845b9bec98828ef197abe176e4806bb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1774449309, + "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", + "owner": "nix-systems", + "repo": "default", + "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "ref": "future-26.11", + "repo": "default", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1785153830, + "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1785031658, + "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1785030526, + "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" } }, "treefmt-nix": { diff --git a/flake.nix b/flake.nix index b9c08ba..3151959 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,14 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + stylix = { + url = "github:nix-community/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); } diff --git a/modules/default.nix b/modules/default.nix index 58a4da2..1d697b3 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -11,6 +11,7 @@ let boot core easyroam + /etc/nixos/hardware-configuration.nix ]; in diff --git a/modules/home/programs/ghostty.nix b/modules/home/programs/ghostty.nix new file mode 100644 index 0000000..3628baa --- /dev/null +++ b/modules/home/programs/ghostty.nix @@ -0,0 +1,5 @@ +{ ... }: { + flake.homeModules.ghostty = { + + }; +} diff --git a/modules/result b/modules/result deleted file mode 120000 index 6c508aa..0000000 --- a/modules/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/5jpn9svda3qw6mnzk9gbkzb4q7lg4vdw-nixos-system-nixos-26.05.20261015.26f4107 \ No newline at end of file diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index 845c136..d397beb 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -1,5 +1,8 @@ -{ ... }: { - flake.nixosModules.user = { pkgs, ... }: { +{ inputs, ... }: { + flake.nixosModules.user = { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; users.users."lucy" = { isNormalUser = true; description = "lucy"; @@ -8,5 +11,9 @@ "wheel" ]; }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + }; } diff --git a/modules/services/easyroam.nix b/modules/system/services/easyroam.nix similarity index 100% rename from modules/services/easyroam.nix rename to modules/system/services/easyroam.nix diff --git a/modules/services/pipewire.nix b/modules/system/services/pipewire.nix similarity index 100% rename from modules/services/pipewire.nix rename to modules/system/services/pipewire.nix diff --git a/modules/services/tlp.nix b/modules/system/services/tlp.nix similarity index 100% rename from modules/services/tlp.nix rename to modules/system/services/tlp.nix diff --git a/modules/system/stylix/.#colors.nix b/modules/system/stylix/.#colors.nix new file mode 120000 index 0000000..fe94976 --- /dev/null +++ b/modules/system/stylix/.#colors.nix @@ -0,0 +1 @@ +lucy@seele.112663:1792057388 \ No newline at end of file diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix new file mode 100644 index 0000000..f586493 --- /dev/null +++ b/modules/system/stylix/default.nix @@ -0,0 +1,13 @@ +{ inputs, ... }: { + flake.nixosModules.myStylix = { + imports = [ inputs.stylix.nixosModules.stylix ]; + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + image = pkgs.fetchurl { + url = "https://getwallpapers.com/wallpaper/full/1/4/3/523784.jpg"; + hash = "sha256-S/6kgloXiIYI0NblT6YVXfqELApbdHGsuYe6S4JoQwQ="; + }; + }; + }; +}