From 09e5d22e2d64aaf4729f1f7fdeab6ad821f33bb1 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Tue, 10 Dec 2024 22:54:57 -0500 Subject: [PATCH] 24.11 update --- flake.lock | 97 +++++++++++++++---- flake.nix | 6 +- src/system/machines/desktop/hardware.nix | 16 +-- src/system/machines/desktop/system.nix | 2 +- src/system/machines/server/system.nix | 2 +- src/system/machines/vm/system.nix | 2 +- src/system/machines/workstation/home.nix | 2 +- src/system/machines/wsl/system.nix | 2 +- .../gui/wm/hyprland/config/waybar/config | 2 +- src/user/modules/gui/wm/hyprland/default.nix | 21 ++-- src/user/modules/gui/wm/sway/default.nix | 2 +- .../utils/modules/neovim/config/pkgs.nix | 2 +- 12 files changed, 109 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index b7bd745..cd17dc9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1721007199, - "narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "bad376945de7033c7adc424c02054ea3736cf7c4", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -36,16 +36,37 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -61,16 +82,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -100,27 +121,48 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1730795826, - "narHash": "sha256-5eUMYntBzgV2EPdPWY4acON2vc4zWrRR7rOJifTqrIE=", + "lastModified": 1733889014, + "narHash": "sha256-6w2W/GXmD4HqaAOXZXbJfJK89qiVi5JI2rygyPwVCtM=", "owner": "nix-community", "repo": "NUR", - "rev": "689c78bc78b5a3aa0e86a2f5cd25a266015791ee", + "rev": "7d710c09dcece5dc146a945d9b6e6a3862985bfa", "type": "github" }, "original": { @@ -152,6 +194,27 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d5eed23..fb637b8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nur = { url = "github:nix-community/NUR"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-wsl = { @@ -30,7 +30,7 @@ allowUnfree = true; }; overlays = [ - nur.overlay + nur.overlays.default ]; }; diff --git a/src/system/machines/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix index b3e6ef2..9a99a3a 100644 --- a/src/system/machines/desktop/hardware.nix +++ b/src/system/machines/desktop/hardware.nix @@ -45,8 +45,6 @@ }; }; - services.xserver.videoDrivers = ["nvidia"]; - hardware = { cpu = { intel = { @@ -54,20 +52,14 @@ }; }; nvidia = { + open = true; modesetting.enable = true; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "550.90.07"; - sha256_64bit = "sha256-Uaz1edWpiE9XOh0/Ui5/r6XnhB4iqc7AtLvq4xsLlzM="; - openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I="; - settingsSha256 = "sha256-sX9dHEp9zH9t3RWp727lLCeJLo8QRAGhVb8iN6eX49g="; - persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870="; - }; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; - opengl = { + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; }; diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix index 0cc82c0..a36eece 100644 --- a/src/system/machines/desktop/system.nix +++ b/src/system/machines/desktop/system.nix @@ -13,7 +13,7 @@ nix = { channel.enable = false; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes keep-going = true diff --git a/src/system/machines/server/system.nix b/src/system/machines/server/system.nix index c68e49f..8c4d9f9 100644 --- a/src/system/machines/server/system.nix +++ b/src/system/machines/server/system.nix @@ -23,7 +23,7 @@ nix = { channel.enable = false; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = "experimental-features = nix-command flakes"; settings = { auto-optimise-store = true; diff --git a/src/system/machines/vm/system.nix b/src/system/machines/vm/system.nix index 172c029..f63f65e 100644 --- a/src/system/machines/vm/system.nix +++ b/src/system/machines/vm/system.nix @@ -14,7 +14,7 @@ nix = { channel.enable = false; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = "experimental-features = nix-command flakes"; settings = { auto-optimise-store = true; diff --git a/src/system/machines/workstation/home.nix b/src/system/machines/workstation/home.nix index 7e4c153..01b3534 100644 --- a/src/system/machines/workstation/home.nix +++ b/src/system/machines/workstation/home.nix @@ -17,7 +17,7 @@ }; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = "experimental-features = nix-command flakes"; settings = { auto-optimise-store = true; diff --git a/src/system/machines/wsl/system.nix b/src/system/machines/wsl/system.nix index 0778e3f..89bb887 100644 --- a/src/system/machines/wsl/system.nix +++ b/src/system/machines/wsl/system.nix @@ -17,7 +17,7 @@ nix = { channel.enable = false; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/src/user/modules/gui/wm/hyprland/config/waybar/config b/src/user/modules/gui/wm/hyprland/config/waybar/config index 451719f..d8a942c 100644 --- a/src/user/modules/gui/wm/hyprland/config/waybar/config +++ b/src/user/modules/gui/wm/hyprland/config/waybar/config @@ -10,7 +10,7 @@ "custom/logo": { "format": "", "tooltip": false, - "on-click": "alacritty -e neofetch" + "on-click": "alacritty --class sys-specs -e bash -c 'fastfetch; read -n 1'" }, "hyprland/workspaces": { diff --git a/src/user/modules/gui/wm/hyprland/default.nix b/src/user/modules/gui/wm/hyprland/default.nix index e404e55..cef1a80 100644 --- a/src/user/modules/gui/wm/hyprland/default.nix +++ b/src/user/modules/gui/wm/hyprland/default.nix @@ -28,6 +28,7 @@ in exec-once = [ "waybar" + "hyprctl setcursor Vanilla-DMZ 24" ]; bind = [ @@ -47,9 +48,9 @@ in "$mod, F, fullscreen" ", Print, exec, grim ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png" - "SHIFT, Print, exec, grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png" + "$mod&SHIFT, Print, exec, grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png" "$mod&SHIFT, F, exec, alacritty -e sh -c 'EDITOR=nvim ranger'" - #''$mod&SHIFT, Print, exec, sh -c 'grim -g "$(swaymsg -t get_tree | jq -j '"'"'.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"'"'"')" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png'"'' + ''SHIFT, Print, exec, grim -g "$(hyprctl activewindow -j | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"')" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png'' "$mod, D, exec, $menu" "$mod&SHIFT, D, exec, rofi -modi emoji -show emoji" @@ -74,6 +75,7 @@ in windowrulev2 = [ "float, title:(Android Emulator)" "float, title: Extension: (PassFF)" + "float, size 400 600, stayfocused, class:sys-specs" ]; general = { @@ -98,8 +100,9 @@ in }; env = [ - "HYPRCURSOR_SIZE, 24" - "GTK_THEME, Juno-ocean" + "HYPRCURSOR_THEME,Vanilla-DMZ" + "HYPRCURSOR_SIZE,24" + "GTK_THEME,Juno" "LIBVA_DRIVER_NAME,nvidia" "XDG_SESSION_TYPE,wayland" @@ -148,7 +151,7 @@ in terminus-nerdfont noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji ]; @@ -180,13 +183,17 @@ in gtk = { enable = true; theme = { - name = "Juno-ocean"; + name = "Juno"; package = pkgs.juno-theme; }; iconTheme = { name = "Qogir"; package = pkgs.qogir-icon-theme; }; + cursorTheme = { + package = pkgs.vanilla-dmz; + name = "Vanilla-DMZ"; + }; gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; }; @@ -198,7 +205,7 @@ in qt = { enable = true; style = { - name = "juno-ocean"; + name = "juno"; package = pkgs.juno-theme; }; platformTheme.name = "gtk"; diff --git a/src/user/modules/gui/wm/sway/default.nix b/src/user/modules/gui/wm/sway/default.nix index 6a3f5e5..1046119 100644 --- a/src/user/modules/gui/wm/sway/default.nix +++ b/src/user/modules/gui/wm/sway/default.nix @@ -140,7 +140,7 @@ in terminus-nerdfont noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji ]; diff --git a/src/user/modules/utils/modules/neovim/config/pkgs.nix b/src/user/modules/utils/modules/neovim/config/pkgs.nix index e34740f..33a3580 100644 --- a/src/user/modules/utils/modules/neovim/config/pkgs.nix +++ b/src/user/modules/utils/modules/neovim/config/pkgs.nix @@ -6,6 +6,7 @@ let marksman sumneko-lua-language-server stylua nodePackages."@tailwindcss/language-server" + pyright clang-tools #arduino-language-server ]; @@ -14,7 +15,6 @@ let typescript-language-server vscode-langservers-extracted bash-language-server - pyright vls ];