Compare commits

..

4 commits

Author SHA1 Message Date
Emmet
e02cee41ba Updated system 2025-10-10 19:37:28 -05:00
Emmet
b2b7a65cdf Updated system 2025-10-05 22:20:08 -05:00
Emmet
ae77ef6e30 use igpu for hyprland.. 2025-10-05 21:43:08 -05:00
Emmet
239d39e238 added linkwarden extension 2025-10-05 21:42:59 -05:00
7 changed files with 164 additions and 120 deletions

160
flake.lock generated
View file

@ -103,11 +103,11 @@
"blocklist-hosts": {
"flake": false,
"locked": {
"lastModified": 1758853179,
"narHash": "sha256-z3VWoF5/evd0n97AmrWgSskaNqVaad0Ex2pn53JHkSk=",
"lastModified": 1760016705,
"narHash": "sha256-7yHFRojwqAIBddYbmA/uBwcPQk9s3pj0kj13C8G+axA=",
"owner": "StevenBlack",
"repo": "hosts",
"rev": "1dd1fc4a30bad4dbd7ed33962c3ac7a2f2506b77",
"rev": "1cb61353d4a9e616cba7521e094b772a2c3c072a",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1758895312,
"narHash": "sha256-fkGae4lxUPP1KAfZ0Yz5f3KyWHyGRJbdyh4HWJVGTw4=",
"lastModified": 1760134135,
"narHash": "sha256-X1JFfOcXlgzo1MKJ0nySvv2o33rA1CGHTcpiDE37p90=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "4e2ef2f45cd83d4e202a88fa29173dd40739e608",
"rev": "2aacf8ca92001daa02ba216f68194d3fac3f3f0e",
"type": "github"
},
"original": {
@ -146,11 +146,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1758964003,
"narHash": "sha256-snZ/nOHvA1BdGcO+jzaYTAh4vhzHOQ9hivsFdrnlUjc=",
"lastModified": 1760117121,
"narHash": "sha256-M82QKHzBYlBk5+8afnImMjbQFIT5E5JMIBouFlpVq3I=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "fc94b22fd2b6110333e03180c0e36ffd10ae2029",
"rev": "9535ea88059f185b72480d7e7b0cbcdbf06b78a6",
"type": "github"
},
"original": {
@ -162,11 +162,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1756083905,
"narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=",
"lastModified": 1758112371,
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808",
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
"type": "github"
},
"original": {
@ -289,11 +289,11 @@
]
},
"locked": {
"lastModified": 1758810399,
"narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=",
"lastModified": 1760061988,
"narHash": "sha256-CeuMo7fjWm3XaoK+b1PGyaVIlE1GHudoxk9jrJFvfbY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2",
"rev": "c7f4214faca2f196c551b767c12a70bfa0614510",
"type": "github"
},
"original": {
@ -309,11 +309,11 @@
]
},
"locked": {
"lastModified": 1758928860,
"narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=",
"lastModified": 1760130406,
"narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad",
"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": 1758124489,
"narHash": "sha256-YiVF/8Me3vVKJBEgGpQhn0HF09EWfXZGaWLzAaJBrO4=",
"lastModified": 1760023949,
"narHash": "sha256-fu0B4duamVdbkPio/czu1XhsPLRXUJpZLDrSk3nih4U=",
"ref": "refs/heads/main",
"rev": "7f769fa993cb492982d7bf25676c68ddbcc0268e",
"revCount": 395,
"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": 1757230583,
"narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=",
"lastModified": 1759815224,
"narHash": "sha256-HbdOyjqHm38j6o5mV24i0bn+r5ykS+VJBnWJuZ0fE+A=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea",
"rev": "ee974f496a080c61b3164992c850f43741edcc52",
"type": "github"
},
"original": {
@ -765,11 +765,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1758815401,
"narHash": "sha256-Nj4iA2Msx0qfHPFDc0biubSsaChuZQlJrS3aNIaQ/T8=",
"owner": "PedroHLC",
"lastModified": 1759831965,
"narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cc09391d851ec12e1dcbb8d105a75ab6344432b",
"rev": "c9b6fb798541223bbb396d287d16f43520250518",
"type": "github"
},
"original": {
@ -781,11 +781,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1758791193,
"narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=",
"lastModified": 1759994382,
"narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01",
"rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
"type": "github"
},
"original": {
@ -812,11 +812,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1758690382,
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"lastModified": 1760038930,
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
"type": "github"
},
"original": {
@ -843,11 +843,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1756819007,
"narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
"lastModified": 1758690382,
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github"
},
"original": {
@ -869,11 +869,11 @@
]
},
"locked": {
"lastModified": 1756961635,
"narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=",
"lastModified": 1758998580,
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
"owner": "nix-community",
"repo": "NUR",
"rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370",
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
"type": "github"
},
"original": {
@ -892,11 +892,11 @@
]
},
"locked": {
"lastModified": 1758185783,
"narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=",
"lastModified": 1759321049,
"narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4",
"rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd",
"type": "github"
},
"original": {
@ -952,11 +952,11 @@
]
},
"locked": {
"lastModified": 1758767687,
"narHash": "sha256-znUulOqcL/Kkdr7CkyIi8Z1pTGXpi54Xg2FmlyJmv4A=",
"lastModified": 1760063676,
"narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "b8bcc09d4f627f4e325408f6e7a85c3ac31f0eeb",
"rev": "897deed0923cc5a1d560c5176abe0d172ec9716d",
"type": "github"
},
"original": {
@ -970,11 +970,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1758940228,
"narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=",
"lastModified": 1760063676,
"narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2",
"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": {
@ -1022,11 +1022,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1758905463,
"narHash": "sha256-8ANQ3MxULwolfkJEdUYlL5usISAxtysWctqqeSiJ/OE=",
"lastModified": 1759690047,
"narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=",
"owner": "nix-community",
"repo": "stylix",
"rev": "4aae0ebc2b0d37d4f90ace2c8bbadffadb2e2a97",
"rev": "09022804b2bcd217f3a41a644d26b23d30375d12",
"type": "github"
},
"original": {
@ -1116,11 +1116,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1754779259,
"narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=",
"lastModified": 1757716333,
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "097d751b9e3c8b97ce158e7d141e5a292545b502",
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
"type": "github"
},
"original": {
@ -1132,11 +1132,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1754788770,
"narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=",
"lastModified": 1757811970,
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "fb2175accef8935f6955503ec9dd3c973eec385c",
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
"type": "github"
},
"original": {
@ -1148,11 +1148,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1755613540,
"narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=",
"lastModified": 1757811247,
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0",
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
"type": "github"
},
"original": {

View file

@ -122,8 +122,7 @@
};
secrets = {
url = "path:/etc/nixos.secrets";
type = "git";
url = "git+file:///etc/nixos.secrets";
inputs.nixpkgs.follows = "nixpkgs";
};
};

View file

@ -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

View file

@ -42,7 +42,7 @@
};
home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable {
AQ_DRM_DEVICES = lib.mkForce "/dev/dri/card1:/dev/dri/card2";
AQ_DRM_DEVICES = lib.mkForce "/dev/dri/card2:/dev/dri/card1";
};
wayland.windowManager.hyprland = lib.mkIf config.userSettings.hyprland.enable {

View file

@ -13,8 +13,9 @@ in {
programs.brave.enable = true;
programs.brave.package = pkgs.brave;
programs.brave.extensions = [
{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; }
{ id = "oboonakemofpalcgghocfoadofidjkkk"; }
{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # ublock
{ id = "oboonakemofpalcgghocfoadofidjkkk"; } # keepassxc
{ id = "pnidmkljnhbjfffciajlcpeldoljnidn"; } # linkwarden
];
programs.brave.commandLineArgs = [
"--password-store=gnome-libsecret"

View file

@ -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<Workspace> {
@@ -48,22 +48,6 @@ fn get_workspaces(config: &WorkspacesModuleConfig) -> Vec<Workspace> {
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,
},

View file

@ -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"