From 6f6d16dff10934406a78bf6b4d57e4fca0852eef Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 24 Oct 2025 15:18:40 -0500 Subject: [PATCH] Updated system + trying zed --- flake.lock | 197 ++++++++++++++++++---------- flake.nix | 11 +- hosts/snowfire/home.nix | 1 + modules/system/hyprland/default.nix | 7 - modules/user/editor/default.nix | 3 +- modules/user/emacs/default.nix | 6 +- modules/user/office/default.nix | 3 +- modules/user/stylix/default.nix | 2 +- modules/user/xdg/default.nix | 1 - modules/user/zed/default.nix | 19 +++ 10 files changed, 166 insertions(+), 84 deletions(-) create mode 100644 modules/user/zed/default.nix diff --git a/flake.lock b/flake.lock index 6c56873..36fc992 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1760704599, - "narHash": "sha256-RtLXMSutyXiEAqWxBU3z2L6/F65WBwrNBUDVzAUQmGQ=", + "lastModified": 1761326352, + "narHash": "sha256-DoR4mHaStX6Dg2Gilc2Dqr/XaxXmQTOQS5cZ5xKPQJY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "23751a41721938f8102c345509d0f96e2c1a0c57", + "rev": "6492dc810f2f250ef95096910a44f03eea6a594f", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1760721928, - "narHash": "sha256-Bg2sdZZL3zJH61CZ8/84E7xscvBeP1wsae4K2kp75wY=", + "lastModified": 1761325938, + "narHash": "sha256-E2dm2bIlu1zBVBAVYM2bZVdr9vkzXGj70aLTfXuXUKA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2be53643710f2cd0ea0f980b582ec1d7a29fe75d", + "rev": "99807d1b33588b9d113fc5e9cca87e4f1ae3e0a1", "type": "github" }, "original": { @@ -243,7 +243,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761266473, + "narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "5c71d4a730bd3c972befff343bb074421e345937", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1760662441, - "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", + "lastModified": 1761316995, + "narHash": "sha256-BAAjCpjTnfaxtc9NCkbUl9MUv5JmAG5qU7/G8TTHmb4=", "owner": "nix-community", "repo": "home-manager", - "rev": "722792af097dff5790f1a66d271a47759f477755", + "rev": "82b58f38202540bce4e5e00759d115c5a43cab85", "type": "github" }, "original": { @@ -449,7 +449,9 @@ "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", + "hyprland-qtutils": [ + "hyprland-qtutils" + ], "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -503,17 +505,14 @@ "hyprland-qt-support": { "inputs": { "hyprlang": [ - "hyprland", "hyprland-qtutils", "hyprlang" ], "nixpkgs": [ - "hyprland", "hyprland-qtutils", "nixpkgs" ], "systems": [ - "hyprland", "hyprland-qtutils", "systems" ] @@ -535,36 +534,29 @@ "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], + "hyprlang": "hyprlang_2", "hyprutils": [ - "hyprland", "hyprland-qtutils", "hyprlang", "hyprutils" ], "nixpkgs": [ - "hyprland", "nixpkgs" ], - "systems": [ - "hyprland", - "systems" - ] + "systems": "systems_2" }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1759080228, + "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-qtutils", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", "type": "github" } }, @@ -598,6 +590,32 @@ } }, "hyprlang_2": { + "inputs": { + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1749145882, + "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_3": { "inputs": { "hyprutils": [ "hyprlock", @@ -629,13 +647,13 @@ "hyprlock": { "inputs": { "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang_3", + "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ - "nixpkgs" + "nixpkgs-stable" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1760023949, @@ -677,6 +695,33 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland-qtutils", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprland-qtutils", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1749135356, + "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -760,11 +805,11 @@ ] }, "locked": { - "lastModified": 1760534924, - "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", + "lastModified": 1761202163, + "narHash": "sha256-6RySf5VQElrm7RYGWxlIkNttemDp4FF0aH+LX435G2Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "100b4e000032b865563a9754e5bca189bc544764", + "rev": "47976126007d9658ca4ac4dd933bea8846170fd9", "type": "github" }, "original": { @@ -813,11 +858,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760703608, - "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=", - "owner": "PedroHLC", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -829,11 +874,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760580664, - "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -845,26 +890,26 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "type": "indirect" } }, "nixpkgs_2": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -940,11 +985,11 @@ ] }, "locked": { - "lastModified": 1759321049, - "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=", + "lastModified": 1761078382, + "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd", + "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "type": "github" }, "original": { @@ -983,6 +1028,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", "hyprland": "hyprland", + "hyprland-qtutils": "hyprland-qtutils", "hyprlock": "hyprlock", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", @@ -1001,11 +1047,11 @@ ] }, "locked": { - "lastModified": 1760495781, - "narHash": "sha256-3OGPAQNJswy6L4VJyX3U9/z7fwgPFvK6zQtB2NHBV0Y=", + "lastModified": 1761273263, + "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11e0852a2aa3a65955db5824262d76933750e299", + "rev": "28405834d4fdd458d28e123fae4db148daecec6f", "type": "github" }, "original": { @@ -1019,11 +1065,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1760668505, - "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", + "lastModified": 1761273263, + "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", + "rev": "28405834d4fdd458d28e123fae4db148daecec6f", "type": "github" }, "original": { @@ -1063,7 +1109,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_3", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1071,11 +1117,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1761028816, + "narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=", "owner": "nix-community", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "b81dc0a385443099e7d231fe6275189e32c3b760", "type": "github" }, "original": { @@ -1115,6 +1161,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1129,7 +1190,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1235,11 +1296,11 @@ ] }, "locked": { - "lastModified": 1760436527, - "narHash": "sha256-WL9Z2xhyouu4XIKPdqhmRWlZbSvRXD2rInXOZD88u0Y=", + "lastModified": 1761221437, + "narHash": "sha256-6V+PkcUvinA/Ryl+tZO0pLvEmJWzfieMKj8UyAFvduo=", "owner": "winapps-org", "repo": "winapps", - "rev": "9ff17d1baacfcf1f91f09345a3b70eacf8604a41", + "rev": "daa052d42d338a50bb3e093a0c86daa3d32f08c5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a24fda..ebf2a4b 100644 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "nixpkgs/nixos-25.05"; chaotic.url = "github:chaotic-cx/nyx"; home-manager.url = "github:nix-community/home-manager/master"; @@ -93,12 +93,19 @@ hyprland = { url = "github:hyprwm/Hyprland/v0.51.0?submodules=true"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.hyprland-qtutils.follows = "hyprland-qtutils"; + }; + + # FIXME tmp fix + hyprland-qtutils = { + url = "github:hyprwm/hyprland-qtutils/629b15c19fa4082e4ce6be09fdb89e8c3312aed7"; + inputs.nixpkgs.follows = "nixpkgs"; }; hyprlock = { type = "git"; url = "https://code.hyprland.org/hyprwm/hyprlock.git"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-stable"; }; plasma-manager = { diff --git a/hosts/snowfire/home.nix b/hosts/snowfire/home.nix index cc420e9..2dee963 100644 --- a/hosts/snowfire/home.nix +++ b/hosts/snowfire/home.nix @@ -14,6 +14,7 @@ # programs browser = "brave"; editor = "emacs"; + zed.enable = true; vscodium.enable = true; yazi.enable = true; git.enable = true; diff --git a/modules/system/hyprland/default.nix b/modules/system/hyprland/default.nix index 86b7def..bfe47ec 100644 --- a/modules/system/hyprland/default.nix +++ b/modules/system/hyprland/default.nix @@ -125,13 +125,6 @@ in jack.enable = true; }; - # Some fancy fonts - fonts.packages = with pkgs-stable; [ - # Fonts - nerdfonts - powerline - ]; - # Auto rotate screen programs.iio-hyprland = { enable = true; diff --git a/modules/user/editor/default.nix b/modules/user/editor/default.nix index c6ac1c5..65bf300 100644 --- a/modules/user/editor/default.nix +++ b/modules/user/editor/default.nix @@ -8,7 +8,7 @@ in { userSettings.editor = lib.mkOption { default = "vscodium"; description = "Default editor"; - type = lib.types.enum [ "emacs" "kate" "vscodium" ]; + type = lib.types.enum [ "emacs" "kate" "vscodium" "zed"]; # TODO add more editors #type = lib.types.enum [ "emacs" "vim" "nvim" "neovide" "nano" "micro" "vscodium" "kate" "pulsar" ]; }; @@ -19,6 +19,7 @@ in { }; config = { + userSettings.zed.enable = lib.mkIf (config.userSettings.editor == "zed") true; userSettings.emacs.enable = lib.mkIf (config.userSettings.editor == "emacs") true; userSettings.vscodium.enable = lib.mkIf (config.userSettings.editor == "vscodium") true; home.packages = with pkgs; diff --git a/modules/user/emacs/default.nix b/modules/user/emacs/default.nix index db47798..f763441 100644 --- a/modules/user/emacs/default.nix +++ b/modules/user/emacs/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, pkgs-stable, ... }: let cfg = config.userSettings.emacs; @@ -15,10 +15,10 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ + home.packages = with pkgs-stable; [ (pkgs.emacsWithPackagesFromUsePackage { config = ./init.el; - package = pkgs.emacs-git-pgtk; + package = pkgs-stable.emacs-pgtk; alwaysEnsure = false; extraEmacsPackages = epkgs: with epkgs; [ org-modern olivetti diff --git a/modules/user/office/default.nix b/modules/user/office/default.nix index 29c471d..a9922d0 100644 --- a/modules/user/office/default.nix +++ b/modules/user/office/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, pkgs-stable, ... }: let cfg = config.userSettings.office; @@ -26,6 +26,7 @@ in { ]; services.syncthing.enable = true; services.nextcloud-client = { + package = pkgs-stable.nextcloud-client; enable = true; startInBackground = true; }; diff --git a/modules/user/stylix/default.nix b/modules/user/stylix/default.nix index 3eca713..9109d41 100644 --- a/modules/user/stylix/default.nix +++ b/modules/user/stylix/default.nix @@ -34,7 +34,7 @@ in # TODO abstract fonts into an option monospace = { name = "Fira Code Nerd Font"; - package = pkgs.fira-code-nerdfont; + package = pkgs.nerd-fonts.fira-code; }; serif = { name = "Fira"; diff --git a/modules/user/xdg/default.nix b/modules/user/xdg/default.nix index 65ddca7..7e355ec 100644 --- a/modules/user/xdg/default.nix +++ b/modules/user/xdg/default.nix @@ -37,6 +37,5 @@ in { }; xdg.mime.enable = true; xdg.mimeApps.enable = true; - home.file.External.source = config.lib.file.mkOutOfStoreSymlink "/run/media/" + config.home.username; }; } diff --git a/modules/user/zed/default.nix b/modules/user/zed/default.nix new file mode 100644 index 0000000..da15b5c --- /dev/null +++ b/modules/user/zed/default.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.userSettings.zed; +in { + options = { + userSettings.zed = { + enable = lib.mkEnableOption "Enable zed editor"; + }; + }; + + config = lib.mkIf cfg.enable { + programs.zed-editor.enable = true; + programs.zed-editor.extensions = [ + "nix" + "gdscript" + ]; + }; +}