diff options
| -rw-r--r-- | flake.lock | 227 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | hosts/adam/configuration.nix | 11 | ||||
| -rw-r--r-- | hosts/lilith/configuration.nix | 21 | ||||
| -rw-r--r-- | hosts/sachiel/configuration.nix | 5 |
5 files changed, 58 insertions, 215 deletions
@@ -1,31 +1,16 @@ { "nodes": { - "cl-nix-lite": { - "locked": { - "lastModified": 1728174978, - "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=", - "owner": "hraban", - "repo": "cl-nix-lite", - "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87", - "type": "github" - }, - "original": { - "owner": "hraban", - "repo": "cl-nix-lite", - "type": "github" - } - }, "firefox-addons": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1761969823, - "narHash": "sha256-YqUB0AYD4KbeqvSZqPhXhHBj3mLKTyuYrofyRgG3+Xc=", + "lastModified": 1762162438, + "narHash": "sha256-GPnRGcVck+TPiQl6Rqj0i57c8hAa34RsQWVqQAW0OVY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "aecae658b04384b2f87249c6b93fdbfd97ef249d", + "rev": "2cf91d46e558b29f9f9bbdd23408f62e8423aa00", "type": "gitlab" }, "original": { @@ -36,23 +21,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1730663653, - "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=", - "owner": "hraban", - "repo": "flake-compat", - "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e", - "type": "github" - }, - "original": { - "owner": "hraban", - "ref": "fixed-output", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -107,27 +75,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "mac-app-util", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -150,55 +98,31 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1762183399, + "narHash": "sha256-vr2aL1QLfERYTfYBgK8cW3T9eSdSEThH462wKaGlmEU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "a5fee077929ae2f2800c3087dce5e1abb4edfbc6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, - "mac-app-util": { - "inputs": { - "cl-nix-lite": "cl-nix-lite", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1756057867, - "narHash": "sha256-ziR5eQGqRWhW8tf8r0TIplaqNt+HXu1G1X41LUr4IYo=", - "owner": "hraban", - "repo": "mac-app-util", - "rev": "8414fa1e2cb775b17793104a9095aabeeada63ef", - "type": "github" - }, - "original": { - "owner": "hraban", - "repo": "mac-app-util", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-parts": "flake-parts", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1762041886, - "narHash": "sha256-AfQcsHsxOEwMQCO++mfQGJTNFoo0FpIAizhqflDHz/E=", + "lastModified": 1762128253, + "narHash": "sha256-U8N1W90dSQJZ8q0xl3aRC4JBp1c9nxxUcVmTO/zhqbk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3c2b23d87b7e57d384ed899a87f04f0985ece3f2", + "rev": "1af775f26be88b3c5177a9fd23f7f4002bdeaf61", "type": "github" }, "original": { @@ -210,11 +134,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1762038680, - "narHash": "sha256-urivaD3khXn2FoFIUkI3zF3vxM7EkaUSqS4BZA69Mf0=", + "lastModified": 1762102676, + "narHash": "sha256-x2ZQGCkjdYmwMrtKwSjtS6UcBa+VbL2ynzZcv8cgeI0=", "owner": "neovim", "repo": "neovim", - "rev": "a4988bb3cd2d69ce3c934c2a1cf8aa7b16bab29b", + "rev": "130ef73e39ee011c40af96624d0c8ef0fa426b09", "type": "github" }, "original": { @@ -230,32 +154,31 @@ ] }, "locked": { - "lastModified": 1759509947, - "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", + "lastModified": 1762186368, + "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", + "rev": "69921864a70b58787abf5ba189095566c3f0ffd3", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-25.05", "repo": "nix-darwin", "type": "github" } }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1761985367, - "narHash": "sha256-d3r/PvZPbxGyORCIhHFQCy9ErsZ5zvLsDfC7/YocN8M=", + "lastModified": 1762132006, + "narHash": "sha256-p/SPmpOjl0VcN57RSCEas9iCK7ZMACpqjmYhaASavoc=", "owner": "kaylorben", "repo": "nixcord", - "rev": "59ffa1a20eb1311d1447a012fcd839c73cae77be", + "rev": "b7b4ef9e4ea61a83b229957c62e9dd5b5dc1abf8", "type": "github" }, "original": { @@ -297,38 +220,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732617236, - "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { "lastModified": 1761880412, "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "owner": "NixOS", @@ -343,7 +234,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1754028485, "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", @@ -359,23 +250,23 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1759381078, "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", @@ -391,13 +282,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -411,19 +302,18 @@ "inputs": { "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "mac-app-util": "mac-app-util", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "site": "site", "spicetify-nix": "spicetify-nix" } }, "site": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1761326885, @@ -441,15 +331,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", - "systems": "systems_3" + "nixpkgs": "nixpkgs_6", + "systems": "systems_2" }, "locked": { - "lastModified": 1761452941, - "narHash": "sha256-yy+9lSj40cWS4awLqjQ5H5/7/SOf9ZarOgTzH8GHkRk=", + "lastModified": 1762057664, + "narHash": "sha256-mdEEvepIi8ebpGP1WWOHNvNQyd8rF0mUrKAiU6mwHCk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "20a56cfc4dc794ade2e8d4346cc4a5adcd1bb512", + "rev": "4aa6e43d29e3c8acf544aa6782a1963a11369208", "type": "github" }, "original": { @@ -460,21 +350,6 @@ }, "systems": { "locked": { - "lastModified": 1689347925, - "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", - "owner": "nix-systems", - "repo": "default-darwin", - "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-darwin", - "type": "github" - } - }, - "systems_2": { - "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", @@ -488,7 +363,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -502,24 +377,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1755934250, - "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", @@ -2,12 +2,12 @@ description = "Nix configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; + nix-darwin.url = "github:nix-darwin/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; site.url = "github:schererleander/site"; @@ -19,8 +19,6 @@ nixcord.url = "github:kaylorben/nixcord"; firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - - mac-app-util.url = "github:hraban/mac-app-util"; }; outputs = @@ -46,6 +44,7 @@ host = "sachiel"; username = "administrator"; system = linux-system; + useHomeManager = false; extraModules = [ inputs.site.nixosModules.default ]; diff --git a/hosts/adam/configuration.nix b/hosts/adam/configuration.nix index 7d1481a..84bfd64 100644 --- a/hosts/adam/configuration.nix +++ b/hosts/adam/configuration.nix @@ -1,7 +1,4 @@ { - inputs, - system, - host, pkgs, username, ... @@ -12,6 +9,7 @@ ./hardware-configuration.nix ../../modules ../../modules/system + ../../modules/services ]; boot = { @@ -45,9 +43,6 @@ hardware.graphics = { enable = true; enable32Bit = true; - extraPackages = with pkgs; [ - amdvlk - ]; }; environment.variables.AMD_VULKAN_ICD = "RADV"; @@ -69,7 +64,7 @@ xdg-utils pulsemixer ]; - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; }; nx = { @@ -96,5 +91,5 @@ }; }; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } diff --git a/hosts/lilith/configuration.nix b/hosts/lilith/configuration.nix index 65127d7..b8e6a20 100644 --- a/hosts/lilith/configuration.nix +++ b/hosts/lilith/configuration.nix @@ -16,13 +16,8 @@ networking.hostName = host; home-manager.users.${username} = { - imports = [ - inputs.mac-app-util.homeManagerModules.default - ]; - home.username = username; home.homeDirectory = "/Users/${username}"; - programs.home-manager.enable = true; home.packages = with pkgs; [ @@ -34,10 +29,14 @@ zathura zoxide gemini-cli + iterm2 + rectangle + slack + podman nerd-fonts.symbols-only ]; - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; }; system.primaryUser = username; @@ -68,15 +67,10 @@ "openjdk@21" ]; casks = [ - "obsidian" "nextcloud" "mullvad-vpn" "bambu-studio" "arduino-ide" - "iterm2" - "docker-desktop" - "rectangle" - "slack" "anki" ]; onActivation.cleanup = "zap"; @@ -90,11 +84,10 @@ zsh.enable = true; anki.enable = true; spicetify.enable = true; - vscode.enable = true; + zed-editor.enable = true; + obsidian.enable = true; }; }; - - system.stateVersion = 5; } diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix index 0a36191..0aa0675 100644 --- a/hosts/sachiel/configuration.nix +++ b/hosts/sachiel/configuration.nix @@ -155,7 +155,7 @@ services.nextcloud = { enable = true; - package = pkgs.nextcloud31; + package = pkgs.nextcloud32; hostName = "cloud.schererleander.de"; https = true; database.createLocally = true; @@ -197,7 +197,7 @@ set -euo pipefail INSTALL="${pkgs.coreutils}/bin/install" FIND="${pkgs.findutils}/bin/find" - MYSQLDUMP="${pkgs.mariadb-client}/bin/mysqldump" + MYSQLDUMP="${pkgs.mariadb.client}/bin/mysqldump" GZIP="${pkgs.gzip}/bin/gzip" OCC="${lib.getExe config.services.nextcloud.occ}" @@ -236,7 +236,6 @@ ]; }; - nixpkgs.config.allowUnfree = true; system.stateVersion = "25.05"; } |