From 5da6515a4ca77e194879354854dd5e6d7224c293 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 6 Feb 2025 22:46:37 -0500 Subject: [PATCH] cleaning up some monitor related stuff --- flake.lock | 216 +++++++++++++++++++++++++++++++++- flake.nix | 109 +++++++++-------- homes/emenel/default.nix | 3 +- hosts/eddie/configuration.nix | 3 +- modules/home/shell-conf.nix | 1 + 5 files changed, 275 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 3fd2aea..9a83c85 100644 --- a/flake.lock +++ b/flake.lock @@ -172,6 +172,40 @@ "type": "github" } }, + "flake-compat_4": { + "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-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -192,7 +226,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -209,7 +243,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -227,7 +261,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -245,7 +279,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -278,6 +312,27 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_3" + }, + "locked": { + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -300,6 +355,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nix-rice", + "git-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "harfbuzz": { "flake": false, "locked": { @@ -626,6 +703,22 @@ "type": "github" } }, + "kitty-themes-src": { + "flake": false, + "locked": { + "lastModified": 1678282211, + "narHash": "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=", + "owner": "kovidgoyal", + "repo": "kitty-themes", + "rev": "c01fcbd694353507c3cc7f657179bad1f32140a7", + "type": "github" + }, + "original": { + "owner": "kovidgoyal", + "repo": "kitty-themes", + "type": "github" + } + }, "kmonad": { "inputs": { "nixpkgs": [ @@ -812,6 +905,29 @@ "type": "github" } }, + "nix-rice": { + "inputs": { + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "kitty-themes-src": "kitty-themes-src", + "nixpkgs": "nixpkgs_6", + "nixpkgs-lib": "nixpkgs-lib_2", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1729607649, + "narHash": "sha256-H0cr8kohjo+fJIKIpcLZwtmRUGH01Gyld0ulhfqe/Rw=", + "owner": "bertof", + "repo": "nix-rice", + "rev": "91c9dc46b80ecd7295e9accff4728f4efc9a291e", + "type": "github" + }, + "original": { + "owner": "bertof", + "repo": "nix-rice", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1738816619, @@ -843,6 +959,33 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1738702386, @@ -875,6 +1018,22 @@ "type": "github" } }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1708118438, @@ -924,6 +1083,37 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1729507178, + "narHash": "sha256-3UZqmGSK+uMUGkydhnqng/iaT857JtAxH9DtucTbUQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e156ec8b02301cd455ab96bbd53ebd7bf7d1e29d", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1738680400, "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", @@ -1043,8 +1233,9 @@ "musnix": "musnix", "niri": "niri", "nix-flatpak": "nix-flatpak", + "nix-rice": "nix-rice", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "paperwm": "paperwm", "shikane": "shikane", "sops-nix": "sops-nix", @@ -1295,6 +1486,21 @@ "type": "github" } }, + "systems_9": { + "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": [ diff --git a/flake.nix b/flake.nix index 95bdf4d..9f9cfe3 100644 --- a/flake.nix +++ b/flake.nix @@ -12,18 +12,20 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch - yazi = { + yazi = { url = "github:sxyazi/yazi"; inputs.nixpkgs.follows = "nixpkgs"; }; - shikane = { + shikane = { url = "git+https://gitlab.com/w0lff/shikane.git"; inputs.nixpkgs.follows = "nixpkgs"; }; emacs-overlay.url = "github:nix-community/emacs-overlay"; + nix-rice = { url = "github:bertof/nix-rice"; }; + kmonad = { url = "github:kmonad/kmonad?dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -39,7 +41,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - musnix = { + musnix = { url = "github:musnix/musnix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -80,7 +82,13 @@ }; }; - outputs = {nixpkgs, home-manager, self, ... } @ inputs: + outputs = + { + nixpkgs, + home-manager, + self, + ... + }@inputs: let inherit (nixpkgs.lib) genAttrs replaceStrings; inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive; @@ -94,58 +102,59 @@ nameOf = path: replaceStrings [ ".nix" ] [ "" ] (baseNameOf (toString path)); in - { - packages = forAllSystems ( - pkgs: - packagesFromDirectoryRecursive { - inherit (pkgs) callPackage; + { + packages = forAllSystems ( + pkgs: + packagesFromDirectoryRecursive { + inherit (pkgs) callPackage; - directory = ./packages; - } - ); + directory = ./packages; + } + ); - nixosModules = genAttrs (map nameOf (listFilesRecursive ./modules/system)) ( - name: import ./modules/system/${name}.nix - ); + nixosModules = genAttrs (map nameOf (listFilesRecursive ./modules/system)) ( + name: import ./modules/system/${name}.nix + ); - homeModules = genAttrs (map nameOf (listFilesRecursive ./modules/home)) ( - name: import ./modules/home/${name}.nix); + homeModules = genAttrs (map nameOf (listFilesRecursive ./modules/home)) ( + name: import ./modules/home/${name}.nix + ); - overlays = genAttrs (map nameOf (listFilesRecursive ./overlays)) ( - name: import ./overlays/${name}.nix - ); + overlays = genAttrs (map nameOf (listFilesRecursive ./overlays)) ( + name: import ./overlays/${name}.nix + ); - nixosConfigurations = { - eddie = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - nix-config = self; - }; - modules = [ - inputs.kmonad.nixosModules.default - inputs.musnix.nixosModules.musnix - inputs.niri.nixosModules.niri - ./hosts/eddie/configuration.nix - ]; - }; - }; - - homeConfigurations = { - "emenel" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = { - inherit inputs; - nix-config = self; - }; - - modules = [ - inputs.nix-flatpak.homeManagerModules.nix-flatpak - inputs.sops-nix.homeManagerModules.sops - inputs.niri.homeModules.niri - ./homes/emenel/default.nix - ]; + nixosConfigurations = { + eddie = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit inputs; + nix-config = self; }; + modules = [ + inputs.kmonad.nixosModules.default + inputs.musnix.nixosModules.musnix + inputs.niri.nixosModules.niri + ./hosts/eddie/configuration.nix + ]; }; }; + + homeConfigurations = { + "emenel" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = { + inherit inputs; + nix-config = self; + }; + + modules = [ + inputs.nix-flatpak.homeManagerModules.nix-flatpak + inputs.sops-nix.homeManagerModules.sops + inputs.niri.homeModules.niri + ./homes/emenel/default.nix + ]; + }; + }; + }; } diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 82f048b..e362284 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -8,7 +8,8 @@ ++ [ inputs.emacs-overlay.overlays.default inputs.audio.overlays.default inputs.niri.overlays.niri - inputs.shikane.overlays.default ]; + inputs.shikane.overlays.default + inputs.nix-rice.overlays.default ]; }; imports = with nix-config.homeModules; [ diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 25b2e65..33d070e 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -19,7 +19,8 @@ allowUnfree = true; }; overlays = builtins.attrValues nix-config.overlays - ++ [ inputs.niri.overlays.niri ]; + ++ [ inputs.niri.overlays.niri + inputs.nix-rice.overlays.default ]; }; # environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}"; diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index c173a64..6a65fe6 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -53,6 +53,7 @@ numbat glpng nurl + # global node packages nodePackages.typescript-language-server nodePackages.vscode-langservers-extracted