From e02cee41ba3111d34bbcdf8bb42abece79860c43 Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 10 Oct 2025 19:37:28 -0500 Subject: [PATCH] Updated system --- flake.lock | 112 +++++++++++----------- flake.nix | 3 +- hosts/snowfire/hardware-configuration.nix | 28 +++--- modules/user/hyprland/ashell.patch | 81 ++++++++++++---- modules/user/hyprland/default.nix | 5 +- 5 files changed, 136 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 0144b39..7ae1102 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1759598151, - "narHash": "sha256-xwfozRzPrq8PybpRYVkQ/RXF4AbroLk3FMA32XCnFrk=", + "lastModified": 1760016705, + "narHash": "sha256-7yHFRojwqAIBddYbmA/uBwcPQk9s3pj0kj13C8G+axA=", "owner": "StevenBlack", "repo": "hosts", - "rev": "cb59fe4b551d0721c7854c1387557b86c9ead019", + "rev": "1cb61353d4a9e616cba7521e094b772a2c3c072a", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759532138, - "narHash": "sha256-sLQIlgDwMP3mEY2PwjGW+cL56QQ2n2WXoZ3GpG5QWOY=", + "lastModified": 1760134135, + "narHash": "sha256-X1JFfOcXlgzo1MKJ0nySvv2o33rA1CGHTcpiDE37p90=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "bad02bbca5b5c6d45539a0d740ad0e21b1ba9afc", + "rev": "2aacf8ca92001daa02ba216f68194d3fac3f3f0e", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1759655261, - "narHash": "sha256-VqbnVGL7+eb0px3tx9szi38BC+J8ONBi4QAkKPXiokw=", + "lastModified": 1760117121, + "narHash": "sha256-M82QKHzBYlBk5+8afnImMjbQFIT5E5JMIBouFlpVq3I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "85a72536d0224341ffdfb9fbb724f5ef15476dd6", + "rev": "9535ea88059f185b72480d7e7b0cbcdbf06b78a6", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1760061988, + "narHash": "sha256-CeuMo7fjWm3XaoK+b1PGyaVIlE1GHudoxk9jrJFvfbY=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "c7f4214faca2f196c551b767c12a70bfa0614510", "type": "github" }, "original": { @@ -309,11 +309,11 @@ ] }, "locked": { - "lastModified": 1759711004, - "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", + "lastModified": 1760130406, + "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", + "rev": "d305eece827a3fe317a2d70138f53feccaf890a1", "type": "github" }, "original": { @@ -397,11 +397,11 @@ ] }, "locked": { - "lastModified": 1750621377, - "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", + "lastModified": 1759490292, + "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", + "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", "type": "github" }, "original": { @@ -580,11 +580,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1759572448, - "narHash": "sha256-o+r44fqPQM+/hQdjFy9qV9C51Jhty6M4icFVYocyJfA=", + "lastModified": 1760023949, + "narHash": "sha256-fu0B4duamVdbkPio/czu1XhsPLRXUJpZLDrSk3nih4U=", "ref": "refs/heads/main", - "rev": "c8a6768dca626cf7d7cbc333095f048bc007b6d9", - "revCount": 398, + "rev": "36ec73f166d9434a3f27c96c575198906f77644a", + "revCount": 401, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprlock.git" }, @@ -655,11 +655,11 @@ ] }, "locked": { - "lastModified": 1751061882, - "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", + "lastModified": 1759619523, + "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", + "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", "type": "github" }, "original": { @@ -705,11 +705,11 @@ ] }, "locked": { - "lastModified": 1750371869, - "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -727,11 +727,11 @@ ] }, "locked": { - "lastModified": 1759387127, - "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", + "lastModified": 1759815224, + "narHash": "sha256-HbdOyjqHm38j6o5mV24i0bn+r5ykS+VJBnWJuZ0fE+A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", + "rev": "ee974f496a080c61b3164992c850f43741edcc52", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759147044, - "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", - "owner": "PedroHLC", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { @@ -812,11 +812,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -952,11 +952,11 @@ ] }, "locked": { - "lastModified": 1759458749, - "narHash": "sha256-WKnbJnm1B2+TO2ZUudgS39EzecQeLl4/bnRtd3y46LI=", + "lastModified": 1760063676, + "narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bbc3a8ae797d1700e57a4f4bcc4e79af727d4138", + "rev": "897deed0923cc5a1d560c5176abe0d172ec9716d", "type": "github" }, "original": { @@ -970,11 +970,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759718104, - "narHash": "sha256-TbkLsgdnXHUXR4gOQBmhxkEE9ne+eHmX1chZHWRogy0=", + "lastModified": 1760063676, + "narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "edea9f33f9a03f615ad3609a40fbcefe0ec835ca", + "rev": "897deed0923cc5a1d560c5176abe0d172ec9716d", "type": "github" }, "original": { @@ -990,17 +990,17 @@ ] }, "locked": { - "lastModified": 1758406446, - "narHash": "sha256-LO6ab6NcJmRm0xz21YbOAY43qTcos4fTOibw1XGnKYI=", + "lastModified": 1759846034, + "narHash": "sha256-gdA2nBOsjVnv94JHYmoH2aEBb55YBtYGJxktde0ipmg=", "ref": "refs/heads/main", - "rev": "5406586a69cd2a66d674e962a4544647bf02aaa2", - "revCount": 38, + "rev": "52c68ac9430d638a64d608c18cd6c4c38d1dc0e6", + "revCount": 39, "type": "git", - "url": "file://path:/etc/nixos.secrets" + "url": "file:///etc/nixos.secrets" }, "original": { "type": "git", - "url": "file://path:/etc/nixos.secrets" + "url": "file:///etc/nixos.secrets" } }, "stylix": { diff --git a/flake.nix b/flake.nix index 16e49a4..7c093a9 100644 --- a/flake.nix +++ b/flake.nix @@ -122,8 +122,7 @@ }; secrets = { - url = "path:/etc/nixos.secrets"; - type = "git"; + url = "git+file:///etc/nixos.secrets"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/snowfire/hardware-configuration.nix b/hosts/snowfire/hardware-configuration.nix index 2c624a5..4f45a3d 100644 --- a/hosts/snowfire/hardware-configuration.nix +++ b/hosts/snowfire/hardware-configuration.nix @@ -55,7 +55,7 @@ hardware.opengl.extraPackages32 = [ ]; #environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipblas hipfft hipcub hipify ]; - environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipfft hipcub hipify ]; + #environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipfft hipcub hipify ]; services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; @@ -72,19 +72,19 @@ ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_SERIAL_SHORT}=="BTKA121225GP512A", ATTR{queue/scheduler}="bfq" ''; - systemd.tmpfiles.rules = - let - rocmEnv = pkgs.symlinkJoin { - name = "rocm-combined"; - paths = with pkgs.rocmPackages; [ - rocblas - hipblas - clr - ]; - }; - in [ - "L+ /opt/rocm - - - - ${rocmEnv}" - ]; + #systemd.tmpfiles.rules = + # let + # rocmEnv = pkgs.symlinkJoin { + # name = "rocm-combined"; + # paths = with pkgs.rocmPackages; [ + # rocblas + # hipblas + # clr + # ]; + # }; + # in [ + # "L+ /opt/rocm - - - - ${rocmEnv}" + # ]; # my stupid usb hub crashes systemct suspend half of the time now # https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Sleep_hooks diff --git a/modules/user/hyprland/ashell.patch b/modules/user/hyprland/ashell.patch index 76bea3a..374f1f5 100644 --- a/modules/user/hyprland/ashell.patch +++ b/modules/user/hyprland/ashell.patch @@ -1,11 +1,12 @@ diff --git a/src/modules/workspaces.rs b/src/modules/workspaces.rs -index 1bafb6d..c448b02 100644 +index a4e4bb8..803fdb0 100644 --- a/src/modules/workspaces.rs +++ b/src/modules/workspaces.rs -@@ -51,20 +51,20 @@ fn get_workspaces(config: &WorkspacesModuleConfig) -> Vec { +@@ -48,22 +48,6 @@ fn get_workspaces(config: &WorkspacesModuleConfig) -> Vec { + let (special, normal): (Vec<_>, Vec<_>) = workspaces.into_iter().partition(|w| w.id < 0); - // map special workspaces +- // map special workspaces - for w in special.iter() { - result.push(Workspace { - id: w.id, @@ -14,26 +15,68 @@ index 1bafb6d..c448b02 100644 - .split(":") - .last() - .map_or_else(|| "".to_string(), |s| s.to_owned()), -- monitor_id: Some(w.monitor_id as usize), +- monitor_id: w.monitor_id, - monitor: w.monitor.clone(), - active: monitors.iter().any(|m| m.special_workspace.id == w.id), - windows: w.windows, - }); - } -+ //for w in special.iter() { -+ // result.push(Workspace { -+ // id: w.id, -+ // name: w -+ // .name -+ // .split(":") -+ // .last() -+ // .map_or_else(|| "".to_string(), |s| s.to_owned()), -+ // monitor_id: Some(w.monitor_id as usize), -+ // monitor: w.monitor.clone(), -+ // active: monitors.iter().any(|m| m.special_workspace.id == w.id), -+ // windows: w.windows, -+ // }); -+ //} - +- // map normal workspaces for w in normal.iter() { + let display_name = if w.id > 0 { +diff --git a/src/theme.rs b/src/theme.rs +index c0c647d..9f7df19 100644 +--- a/src/theme.rs ++++ b/src/theme.rs +@@ -46,10 +46,10 @@ pub struct Radius { + impl Default for Radius { + fn default() -> Self { + Self { +- sm: 4, +- md: 8, +- lg: 16, +- xl: 32, ++ sm: 0, ++ md: 0, ++ lg: 0, ++ xl: 0, + } + } + } +@@ -406,7 +406,7 @@ impl AshellTheme { + bg_color + })), + border: Border { +- width: if is_empty { 1.0 } else { 0.0 }, ++ width: 0.0, + color: bg_color, + radius: self.radius.lg.into(), + }, +@@ -464,7 +464,7 @@ impl AshellTheme { + let mut base = text_input::Style { + background: theme.palette().background.into(), + border: Border { +- width: 2.0, ++ width: 0.0, + radius: self.radius.xl.into(), + color: theme.extended_palette().background.weak.color, + }, +@@ -493,7 +493,7 @@ impl AshellTheme { + let mut base = button::Style { + background: None, + border: Border { +- width: 2.0, ++ width: 0.0, + radius: self.radius.xl.into(), + color: theme.extended_palette().background.weak.color, + }, +@@ -532,7 +532,7 @@ impl AshellTheme { + .into(), + ), + border: Border { +- width: 2.0, ++ width: 0.0, + radius: self.radius.xl.into(), + color: Color::TRANSPARENT, + }, diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index 069009a..49dec73 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -651,10 +651,10 @@ alert_threshold = 95 warn_threshold = 50 alert_threshold = 75 [system.temp] -warn_threshold = 90 +warn_threshold = 85 alert_threshold = 95 [clock] -format = "%a %d %b %R" +format = "%a %d %b %H:%M:%S" [mediaPlayer] max_title_length = 100 [settings] @@ -665,6 +665,7 @@ wifi_more_cmd = "nm-connection-editor" vpn_more_cmd = "nm-connection-editor" bluetooth_more_cmd = "blueman-manager" [appearance] +scale_factor = 1.25 style = "Solid" opacity = ${if performance then "1.0" else "0.7"} background_color = "#${config.lib.stylix.colors.base00}88"