diff --git a/flake.lock b/flake.lock index 7d7be55..759c945 100644 --- a/flake.lock +++ b/flake.lock @@ -73,6 +73,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -95,6 +111,41 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -134,11 +185,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1737085478, - "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", + "lastModified": 1737517085, + "narHash": "sha256-A5w6+0Zc7b93nbCF6ayHbXIEO0+h+8BR4byYGgTy+tY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", + "rev": "ddf7173ae92b4992c4506b6df4681c0687cc29c3", "type": "github" }, "original": { @@ -212,11 +263,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737299337, - "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=", + "lastModified": 1737575492, + "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3", + "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", "type": "github" }, "original": { @@ -225,6 +276,33 @@ "type": "github" } }, + "isd": { + "inputs": { + "nix-appimage": "nix-appimage", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ], + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix", + "systemd-nix": "systemd-nix", + "systems": "systems_3", + "uv2nix": "uv2nix" + }, + "locked": { + "lastModified": 1737544722, + "narHash": "sha256-XAWQdmd21BGeIkt3ngevgwJW2UJDF/tEu23jVIOTG9U=", + "owner": "isd-project", + "repo": "isd", + "rev": "3bd515e5ccce312d5ff7273afb93e7a775212925", + "type": "github" + }, + "original": { + "owner": "isd-project", + "repo": "isd", + "type": "github" + } + }, "kmonad": { "inputs": { "nixpkgs": [ @@ -286,6 +364,41 @@ "type": "github" } }, + "nix-appimage": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1725758175, + "narHash": "sha256-MhBOJHYhIJ30TNVrm7wX8B3x+MecMCdaBc94g4HXkPs=", + "owner": "ralismark", + "repo": "nix-appimage", + "rev": "fc1192dbec82f5857f86ccc6dfdf2ad97bc9c62a", + "type": "github" + }, + "original": { + "owner": "ralismark", + "repo": "nix-appimage", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1736952876, @@ -303,11 +416,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737306472, - "narHash": "sha256-+X9KAryvDsIE7lQ0FdfiD1u33nOVgsgufedqspf77N4=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cb3173dc5c746fa95bca1f035a7e4d2b588894ac", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -366,11 +479,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -398,11 +511,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1737404927, + "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", "type": "github" }, "original": { @@ -412,6 +541,27 @@ "type": "github" } }, + "paperwm": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736333499, + "narHash": "sha256-sbwsbUU4D7jEk1rf+NNgiFEPTM/NXFzPHVxryKcuVjQ=", + "owner": "paperwm", + "repo": "PaperWM", + "rev": "07214b0ed9983806aa827f6b371431f4a5e58bd8", + "type": "github" + }, + "original": { + "owner": "paperwm", + "repo": "PaperWM", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -432,18 +582,70 @@ "type": "github" } }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "isd", + "nixpkgs" + ], + "pyproject-nix": [ + "isd", + "pyproject-nix" + ], + "uv2nix": [ + "isd", + "uv2nix" + ] + }, + "locked": { + "lastModified": 1735697508, + "narHash": "sha256-Acm4V8bHifkEZEGZHQ9eukRqPiSWXRgJyrjOB60FBg8=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "22d5f5d1814ede904def5a992c289343734672d4", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "isd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735874123, + "narHash": "sha256-0uSnm3tyid97v6/m7SoBPgcfMya3nVqEM9Y2EpaTlp0=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "e14a14de0d0026e62d809bfa4cd92c4f9badb262", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "affinity-nix": "affinity-nix", "ghostty": "ghostty", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", + "isd": "isd", "kmonad": "kmonad", "musnix": "musnix", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable_2", + "paperwm": "paperwm", "sops-nix": "sops-nix", "wezterm": "wezterm" } @@ -476,11 +678,11 @@ ] }, "locked": { - "lastModified": 1737107480, - "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { @@ -489,6 +691,27 @@ "type": "github" } }, + "systemd-nix": { + "inputs": { + "nixpkgs": [ + "isd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1608245516, + "narHash": "sha256-EoEit7oosSNXgIN2WZCb/e8ZbdBuC72eEj66CuLXYOI=", + "owner": "serokell", + "repo": "systemd-nix", + "rev": "61dd95a7a7a5f80ff9b1014f9e9e89bed6f84e2f", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "systemd-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -519,9 +742,79 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1680978846, + "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", + "owner": "nix-systems", + "repo": "x86_64-linux", + "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "x86_64-linux", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "uv2nix": { + "inputs": { + "nixpkgs": [ + "isd", + "nixpkgs" + ], + "pyproject-nix": [ + "isd", + "pyproject-nix" + ] + }, + "locked": { + "lastModified": 1735981341, + "narHash": "sha256-g7Wtbo4fsl0P0HFrg3AG+4j6T4Df8OBwfWtlaJQFlrc=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "9d314f9c9ab531791a63a6673b1120039dea1229", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_4", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", diff --git a/flake.nix b/flake.nix index 4203382..c28cab0 100644 --- a/flake.nix +++ b/flake.nix @@ -47,12 +47,18 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # zjstatus = { - # url = "github:dj95/zjstatus"; - # }; + isd = { + url = "github:isd-project/isd"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + paperwm = { + url = "github:paperwm/PaperWM"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = {nixpkgs, home-manager, sops-nix, nix-flatpak, kmonad, musnix, self, ... } @ inputs: + outputs = {nixpkgs, home-manager, sops-nix, kmonad, musnix, self, ... } @ inputs: let inherit (self) outputs; # Supported systems for your flake packages, shell, etc. @@ -79,7 +85,7 @@ }; modules = [ sops-nix.nixosModules.sops - nix-flatpak.nixosModules.nix-flatpak + inputs.nix-flatpak.nixosModules.nix-flatpak kmonad.nixosModules.default musnix.nixosModules.musnix ./system/eddie/configuration.nix @@ -96,7 +102,7 @@ }; modules = [ - nix-flatpak.homeManagerModules.nix-flatpak + inputs.nix-flatpak.homeManagerModules.nix-flatpak sops-nix.homeManagerModules.sops ./home/home.nix ]; diff --git a/home/home.nix b/home/home.nix index 680da82..a862301 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,4 @@ -{ nix-flatpak, lib, config, pkgs, inputs, outputs, ... }: +{ lib, config, pkgs, inputs, outputs, ... }: { nixpkgs = { @@ -28,6 +28,8 @@ thonny + inputs.isd.packages.x86_64-linux.default + just yt-dlp erdtree @@ -181,6 +183,8 @@ nixdoc nix-init + git-annex + fishPlugins.foreign-env fishPlugins.z fishPlugins.fzf-fish @@ -495,11 +499,11 @@ thefuck = { enable = true; }; - ghostty = { - enable = true; - package = inputs.ghostty.packages.x86_64-linux.ghostty; - enableFishIntegration = true; - }; + # ghostty = { + # enable = true; + # package = inputs.ghostty.packages.x86_64-linux.ghostty; + # enableFishIntegration = true; + # }; wezterm = { enable = true; package = inputs.wezterm.packages.${pkgs.system}.default; @@ -687,7 +691,7 @@ # moving files! xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile; xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml; - xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty; + # xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty; xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm; xdg.configFile."git".source = ../dotfiles/dot_config/git; xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw; diff --git a/overlays/default.nix b/overlays/default.nix index 55027e8..3f5233c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,7 +16,7 @@ ]; }); - # zjstatus = inputs.zjstatus.packages.${prev.system}.default; + gnome47Extensions.paperwm = inputs.paperwm.packages.x86_64-linux.default; wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: { patches = old.patches ++ [ ./wine-6006.patch ]; @@ -35,41 +35,41 @@ patches = [""]; }); - openrazer-daemon = prev.openrazer-daemon.overrideDerivation (previous: { - name = "openrazer-daemon"; - src = prev.fetchFromGitHub { - owner = "openrazer"; - repo = "openrazer"; - hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; - rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - }; - }); + # openrazer-daemon = prev.openrazer-daemon.overrideDerivation (previous: { + # # name = "openrazer-daemon"; + # src = prev.fetchFromGitHub { + # owner = "openrazer"; + # repo = "openrazer"; + # hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + # rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + # }; + # }); - python312 = prev.python312.override { - packageOverrides = pyself: pysuper: { - openrazer = pysuper.openrazer.overrideAttrs (_: { - src = prev.fetchFromGitHub { - owner = "openrazer"; - repo = "openrazer"; - hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; - rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - }; - }); - }; - }; + # python312 = prev.python312.override { + # packageOverrides = pyself: pysuper: { + # openrazer = pysuper.openrazer.overrideAttrs (_: { + # src = prev.fetchFromGitHub { + # owner = "openrazer"; + # repo = "openrazer"; + # hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + # rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + # }; + # }); + # }; + # }; - python311 = prev.python311.override { - packageOverrides = pyself: pysuper: { - openrazer = pysuper.openrazer.overrideAttrs (_: { - src = prev.fetchFromGitHub { - owner = "openrazer"; - repo = "openrazer"; - hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; - rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; - }; - }); - }; - }; + # python311 = prev.python311.override { + # packageOverrides = pyself: pysuper: { + # openrazer = pysuper.openrazer.overrideAttrs (_: { + # src = prev.fetchFromGitHub { + # owner = "openrazer"; + # repo = "openrazer"; + # hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM="; + # rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5"; + # }; + # }); + # }; + # }; }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 37f4a2b..f3cff5a 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -77,7 +77,7 @@ adi1090x-plymouth-themes # solaar # logitech-udev-rules - linuxKernel.packages.linux_6_12.openrazer + linuxKernel.packages.linux_6_13.openrazer ]; # Bootloader. @@ -216,6 +216,7 @@ services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. # services.xserver.enableTearFree = true; services.gnome.gnome-keyring.enable = true; + services.gnome.gnome-settings-daemon.enable = true; services.picom = { enable = true;