From c5513bf9b2c74fb5786411027c4a2e272edbb611 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Fri, 14 Feb 2025 16:00:25 +0200 Subject: [PATCH] upd --- flake.lock | 8 +-- hosts/dunamis/hardware-conf.nix | 18 +++++- hosts/dunamis/stylix.nix | 4 +- hosts/dunamis/users/user/programs.nix | 24 ++++---- modules/home/desktop/niri/default.nix | 88 +++++++++++++++++++-------- 5 files changed, 95 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 4e1f565..18a9525 100644 --- a/flake.lock +++ b/flake.lock @@ -635,11 +635,11 @@ ] }, "locked": { - "lastModified": 1739126593, - "narHash": "sha256-aVixbVsMsb63xH8Bi/6/xaN1rEF8uMvx0vWbN41Or6o=", + "lastModified": 1739201350, + "narHash": "sha256-jfdYDmTyLnqYXdn1W8y66YhANM92+6IagzNXYHIROiU=", "ref": "refs/heads/main", - "rev": "c528a43b7ab04cd818441dc87ccde082b33bd12f", - "revCount": 6, + "rev": "efba4fac34fe29f50f01950792fb0adf77926fc4", + "revCount": 7, "type": "git", "url": "https://gitea.linerds.us/unexplrd/Neve" }, diff --git a/hosts/dunamis/hardware-conf.nix b/hosts/dunamis/hardware-conf.nix index b819ee0..7d9cacc 100644 --- a/hosts/dunamis/hardware-conf.nix +++ b/hosts/dunamis/hardware-conf.nix @@ -33,17 +33,29 @@ "/" = { device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a"; fsType = "btrfs"; - options = ["compress=zstd,subvol=@nixos-root"]; + options = [ + "noatime" + "compress=zstd" + "subvol=@nixos-root" + ]; }; "/home" = { device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a"; fsType = "btrfs"; - options = ["compress=zstd,subvol=@home"]; + options = [ + "noatime" + "compress=zstd" + "subvol=@home" + ]; }; "/storage" = { device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a"; fsType = "btrfs"; - options = ["compress=zstd,subvol=@storage"]; + options = [ + "noatime" + "compress=zstd" + "subvol=@storage" + ]; }; "/boot" = { device = "/dev/disk/by-uuid/976C-7EE6"; diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix index 42f3d51..414df2b 100644 --- a/hosts/dunamis/stylix.nix +++ b/hosts/dunamis/stylix.nix @@ -12,14 +12,14 @@ ]; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/helios.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/solarflare.yaml"; polarity = "dark"; cursor = { package = pkgs.bibata-cursors-translucent; name = "Bibata_Tinted"; size = 32; }; - image = ../../wallpapers/wallhaven-zyl9qg.png; + image = ../../wallpapers/wallhaven-39vk3v.jpg; opacity.terminal = 0.9; fonts = { sizes = { diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix index 1717066..258ac00 100644 --- a/hosts/dunamis/users/user/programs.nix +++ b/hosts/dunamis/users/user/programs.nix @@ -20,6 +20,7 @@ enable = true; delta.enable = true; aliases = { + cl = "clone"; co = "checkout"; pom = "push origin main"; }; @@ -38,16 +39,17 @@ }; home.packages = with pkgs; [ - alejandra - flatpak - trashy - procs - dust - tree - zip - vial - unzip - waycheck - virt-manager + alejandra # nix formatter + flatpak # flatpak cli + trashy # trash cli + procs # ps in rust + dust # du in rust + fend # calc in rust + tree # tree util + zip # zip util + vial # qmk keyboard configuring app + unzip # unzip util + waycheck # check wayland protocols + virt-manager # libvirt gui ]; } diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix index 6396c31..2a2ee4c 100644 --- a/modules/home/desktop/niri/default.nix +++ b/modules/home/desktop/niri/default.nix @@ -509,13 +509,43 @@ in { window-rule { match app-id=r#"^org\.keepassxc\.KeePassXC$"# - match app-id=r#"^org\.telegram\.desktop$"# match app-id=r#"^org\.gnome\.World\.Secrets$"# + match app-id=r#"^org\.telegram\.desktop$"# match app-id=r#"^signal$"# match app-id=r#"^Bitwarden$"# // block-out-from "screen-capture" block-out-from "screencast" } + workspace "general" + workspace "browse" + workspace "chat" + workspace "code" + workspace "uni" + workspace "games" + workspace "sysadmin" + workspace "media" + workspace "bg" + + window-rule { + match app-id=r#"^org\.telegram\.desktop$"# + match app-id=r#"^im\.riot\.Riot$"# + match app-id=r#"^WebCord$"# + match app-id=r#"^signal$"# + open-on-workspace "chat" + } + + window-rule { + match app-id=r#"^com\.heroicgameslauncher\.hgl$"# + match app-id=r#"^net\.lutris\.Lutris$"# + match app-id="steam" + // match app-id=r#"^$"# + open-on-workspace "games" + } + + window-rule { + match app-id=r#"^com\.obsproject\.Studio$"# + open-on-workspace "bg" + } binds { Mod+Shift+Slash { show-hotkey-overlay; } @@ -618,24 +648,24 @@ in { Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } - Mod+1 { focus-workspace 1; } - Mod+2 { focus-workspace 2; } - Mod+3 { focus-workspace 3; } - Mod+4 { focus-workspace 4; } - Mod+5 { focus-workspace 5; } - Mod+6 { focus-workspace 6; } - Mod+7 { focus-workspace 7; } - Mod+8 { focus-workspace 8; } - Mod+9 { focus-workspace 9; } - Mod+Ctrl+1 { move-column-to-workspace 1; } - Mod+Ctrl+2 { move-column-to-workspace 2; } - Mod+Ctrl+3 { move-column-to-workspace 3; } - Mod+Ctrl+4 { move-column-to-workspace 4; } - Mod+Ctrl+5 { move-column-to-workspace 5; } - Mod+Ctrl+6 { move-column-to-workspace 6; } - Mod+Ctrl+7 { move-column-to-workspace 7; } - Mod+Ctrl+8 { move-column-to-workspace 8; } - Mod+Ctrl+9 { move-column-to-workspace 9; } + Mod+1 { focus-workspace "general"; } + Mod+2 { focus-workspace "browse"; } + Mod+3 { focus-workspace "chat"; } + Mod+4 { focus-workspace "code"; } + Mod+5 { focus-workspace "uni"; } + Mod+6 { focus-workspace "games"; } + Mod+7 { focus-workspace "sysadmin"; } + Mod+8 { focus-workspace "media"; } + Mod+9 { focus-workspace "bg"; } + Mod+Ctrl+1 { move-column-to-workspace "general"; } + Mod+Ctrl+2 { move-column-to-workspace "browse"; } + Mod+Ctrl+3 { move-column-to-workspace "chat"; } + Mod+Ctrl+4 { move-column-to-workspace "code"; } + Mod+Ctrl+5 { move-column-to-workspace "uni"; } + Mod+Ctrl+6 { move-column-to-workspace "games"; } + Mod+Ctrl+7 { move-column-to-workspace "sysadmin"; } + Mod+Ctrl+8 { move-column-to-workspace "media"; } + Mod+Ctrl+9 { move-column-to-workspace "bg"; } // Mod+Q { focus-workspace 1; } // Mod+W { focus-workspace 2; } @@ -730,9 +760,18 @@ in { "niri/workspaces" = { format = "{icon}"; format-icons = { - focused = "󰗝"; - active = "󰻃"; - default = "󰄰"; + general = "󰾞"; + browse = "󰜏"; + chat = "󰭹"; + code = "󰅩"; + uni = "󰁰"; + games = "󰺵"; + sysadmin = "󰒓"; + media = "󱖑"; + bg = "󰣆"; + # focused = "󰗝"; + # active = "󰻃"; + default = "󰘧"; }; }; "niri/language" = { @@ -745,11 +784,6 @@ in { interval = "once"; tooltip = false; }; - "custom/text" = { - format = "here will be workspaces"; - interval = "once"; - tooltip = false; - }; "group/niri" = { orientation = "inherit"; modules = [