From 97789f807bcc20c6833ea06f48dbb7a68914eb79 Mon Sep 17 00:00:00 2001 From: cnst Date: Thu, 27 Jun 2024 17:07:56 +0200 Subject: [PATCH] add restruct --- flake.lock | 36 +++++++++---------- flake.nix | 2 +- home/modules/hypr/default.nix | 1 + home/modules/neovim/default.nix | 4 +-- hosts/cnix/default.nix | 1 - hosts/{pkgs/cnix.nix => common/cnix-pkgs.nix} | 17 +-------- hosts/common/default.nix | 28 ++------------- hosts/{pkgs => common}/fonts.nix | 0 hosts/services/cnix.nix | 4 +++ 9 files changed, 30 insertions(+), 63 deletions(-) rename hosts/{pkgs/cnix.nix => common/cnix-pkgs.nix} (67%) rename hosts/{pkgs => common}/fonts.nix (100%) diff --git a/flake.lock b/flake.lock index e6046b23..822b130a 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1719426013, - "narHash": "sha256-rhSqzuehCYBB9Vdb8hZ5fRKTb9yitQS3AE5QYskTbZM=", + "lastModified": 1719491277, + "narHash": "sha256-eC3o+NXisjCOp2859tKN4gHrk5wkstMsqdrmWFkcagY=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "d102de8702bb3a3cb58d4f413a21103562115577", + "rev": "6086714009c9771504f2355d665d4a543f359ab3", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "hardware": { "locked": { - "lastModified": 1719413427, - "narHash": "sha256-WS087+fEO804gWvwqEfclbLFw6xdrrtZZULSyQafMdg=", + "lastModified": 1719487696, + "narHash": "sha256-pCsl9qFCuIuhIfGH03CiBOsy1LNwITC6VMb6/5tz+Qc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "901bc809b5d3e73a609a167385df23311d81b39c", + "rev": "14aadcba1a26c8c142453839f888afd0db8b2041", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1719418488, - "narHash": "sha256-Hu75KIbGLJA8qe42rO5WkRQ+E+BuzjS42bNEZcy9zT8=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "607f969f5dca2dc100cbc53e24ab49ac24ef8987", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1719410911, - "narHash": "sha256-jnL8LSx1wJvJTBBRwjaggFUzc9q0/KXbvPmP3tyeyag=", + "lastModified": 1719467057, + "narHash": "sha256-8gQ0txwuLoBpBeIhTAkl+/7Hi/AD4KE5m4YhOn1OA3E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "86c00892c3ae4869eb99b677b48ee111409a93f1", + "rev": "bb6bea003dc464a4248a173e71a007d368691092", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719349695, - "narHash": "sha256-rnBC/8Y0CECztfoMKBxxo4hzd4TBu1bu9CnwpWDaB1U=", + "lastModified": 1719414226, + "narHash": "sha256-h/qJ+1R+BtY+mX02UsqYW82hEl78mrHTGAs9yjpFEzU=", "owner": "neovim", "repo": "neovim", - "rev": "9dc09a4cdde9fad4e7861b9467276260bd9b82a9", + "rev": "fc9b70826ec88ca2e6c0624c522b872e87aa7ac1", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719253556, - "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2989a431..ef651679 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ in { inherit lib; - formatter = forEachSystem (pkgs: pkgs.alejandra); + formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt); nixosConfigurations = { diff --git a/home/modules/hypr/default.nix b/home/modules/hypr/default.nix index aab36e74..b8126e3f 100644 --- a/home/modules/hypr/default.nix +++ b/home/modules/hypr/default.nix @@ -23,6 +23,7 @@ hyprpicker swaybg tofi + gnome.gnome-calculator ]; home.sessionVariables = { diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix index 8709e698..acf7e785 100644 --- a/home/modules/neovim/default.nix +++ b/home/modules/neovim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: with pkgs; let @@ -96,7 +96,7 @@ in programs.neovim = { enable = true; defaultEditor = true; - package = pkgs.neovim-unwrapped; + package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default; plugins = with pkgs.vimPlugins; [ telescope-cheat-nvim ]; inherit extraPackages; }; diff --git a/hosts/cnix/default.nix b/hosts/cnix/default.nix index c44b8745..c33ccd93 100644 --- a/hosts/cnix/default.nix +++ b/hosts/cnix/default.nix @@ -30,7 +30,6 @@ in imports = [ inputs.home-manager.nixosModules.home-manager - ../pkgs/fonts.nix ../common ../extra/steam ../extra/nix-ld diff --git a/hosts/pkgs/cnix.nix b/hosts/common/cnix-pkgs.nix similarity index 67% rename from hosts/pkgs/cnix.nix rename to hosts/common/cnix-pkgs.nix index 062ea497..cd40e61b 100644 --- a/hosts/pkgs/cnix.nix +++ b/hosts/common/cnix-pkgs.nix @@ -3,7 +3,6 @@ environment = { systemPackages = [ # Dev - pkgs.git pkgs.pyright pkgs.python3 pkgs.gcc @@ -26,26 +25,12 @@ pkgs.clang pkgs.clang-tools pkgs.alejandra + pkgs.nixpkgs-fmt # Util - pkgs.stow - pkgs.gnumake - pkgs.wget - pkgs.curl - pkgs.ripgrep - pkgs.python312Packages.oauth2 - pkgs.python312Packages.httplib2 pkgs.python312Packages.pip - pkgs.killall - pkgs.tree-sitter - pkgs.lazygit pkgs.tmux pkgs.tmuxifier - pkgs.unzip - pkgs.p7zip - pkgs.unrar - pkgs.xdg-utils - pkgs.xdg-user-dirs ]; }; } diff --git a/hosts/common/default.nix b/hosts/common/default.nix index c96aa546..25adeb98 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -11,6 +11,8 @@ ./adb.nix ./neovim.nix ./zsh.nix + ./cnix-pkgs.nix + ./fonts.nix ]; home-manager = { # useGlobalPkgs = true; @@ -34,39 +36,14 @@ systemPackages = [ # Dev pkgs.git - pkgs.pyright - pkgs.python3 - pkgs.gcc - pkgs.go - pkgs.nodePackages_latest.npm - pkgs.nodePackages_latest.nodejs - pkgs.nodePackages.prettier - pkgs.nodePackages.prettier-plugin-toml - pkgs.lua-language-server - pkgs.stylua - pkgs.prettierd - pkgs.cargo - pkgs.hyprlang - pkgs.nixd - pkgs.nil - pkgs.black - pkgs.python312Packages.jedi-language-server - pkgs.isort - pkgs.bacon - pkgs.clang - pkgs.clang-tools - pkgs.alejandra # Util pkgs.stow - pkgs.gnumake pkgs.wget pkgs.curl pkgs.ripgrep pkgs.python312Packages.oauth2 pkgs.python312Packages.httplib2 - pkgs.python312Packages.pip - pkgs.python312Packages.dbus-python pkgs.killall pkgs.tree-sitter pkgs.lazygit @@ -77,6 +54,7 @@ pkgs.unrar pkgs.xdg-utils pkgs.xdg-user-dirs + pkgs.udiskie ]; }; } diff --git a/hosts/pkgs/fonts.nix b/hosts/common/fonts.nix similarity index 100% rename from hosts/pkgs/fonts.nix rename to hosts/common/fonts.nix diff --git a/hosts/services/cnix.nix b/hosts/services/cnix.nix index eacc57c5..cc62ca48 100644 --- a/hosts/services/cnix.nix +++ b/hosts/services/cnix.nix @@ -1,6 +1,10 @@ { pkgs, ... }: { services = { + dbus.packages = with pkgs; [ + gcr + gnome.gnome-settings-daemon + ]; udisks2.enable = true; gvfs.enable = true; blueman.enable = true;