From 65242cd03a59925468761d1e65279411adaf4141 Mon Sep 17 00:00:00 2001 From: autumn Date: Tue, 2 Dec 2025 08:48:55 -0700 Subject: [PATCH] add polkit and attempt to autostart swaybg in niri --- flake.lock | 46 +++++++++++++-------------- flake.nix | 2 +- home/packages/alacritty/alacritty.nix | 2 -- home/packages/helix/helix.nix | 2 +- home/packages/niri/niri.kdl | 24 +++++++++++--- home/packages/waybar/waybar.css | 4 +++ home/packages/waybar/waybar.nix | 13 +++++++- system/defaults/security.nix | 6 ++++ system/packages/sddm/bincache.nix | 14 -------- system/services/swaybg.nix | 16 ++++++++++ system/yukigekko/configuration.nix | 19 ++++++++--- 11 files changed, 96 insertions(+), 52 deletions(-) create mode 100644 system/defaults/security.nix delete mode 100644 system/packages/sddm/bincache.nix create mode 100644 system/services/swaybg.nix diff --git a/flake.lock b/flake.lock index 28fc561..7627887 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1760130406, - "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=", + "lastModified": 1764636297, + "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d305eece827a3fe317a2d70138f53feccaf890a1", + "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1760208466, - "narHash": "sha256-1tQJ7hOxG7SN61ZMTrOewtv7FV1JHCcHiU8fQ7DYuos=", - "rev": "d9c1c0925ca74536bfaeaeb69042886e33c4e5a6", + "lastModified": 1764637364, + "narHash": "sha256-QFnWVaNNEhM9Q5RP52yj2zeB1mUfKVY96IFegnWLH94=", + "rev": "716a885def4eadc4a031a931eea1e8dc135341ad", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d9c1c0925ca74536bfaeaeb69042886e33c4e5a6.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/716a885def4eadc4a031a931eea1e8dc135341ad.tar.gz?rev=716a885def4eadc4a031a931eea1e8dc135341ad" }, "original": { "type": "tarball", @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1756511062, - "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", - "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", + "lastModified": 1764519849, + "narHash": "sha256-XnNABKfIYKSimQVvKc9FnlC2H0LurOhd9MS6l0Z67lE=", + "rev": "6c95c0b6f73f831226453fc6905c216ab634c30f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/6c95c0b6f73f831226453fc6905c216ab634c30f.tar.gz?rev=6c95c0b6f73f831226453fc6905c216ab634c30f" }, "original": { "type": "tarball", @@ -150,11 +150,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759833546, - "narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=", + "lastModified": 1764591717, + "narHash": "sha256-T/HMA0Bb/O6UnlGQ0Xt+wGe1j8m7eyyQ5+vVcCJslsM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730", + "rev": "84d1dab290feb4865d0cfcffc7aa0cf9bc65c3b7", "type": "github" }, "original": { @@ -198,11 +198,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a87d05e..2738f45 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # pydev.url ="./system/extras/pydev/"; currents.url = "github:autumnalmusing/currents/main"; #regular flakes - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; lix.flake = false; lix-module = { diff --git a/home/packages/alacritty/alacritty.nix b/home/packages/alacritty/alacritty.nix index b88e235..0b451ff 100644 --- a/home/packages/alacritty/alacritty.nix +++ b/home/packages/alacritty/alacritty.nix @@ -16,8 +16,6 @@ }; }; window = { - opacity = 0.9; - blur = true; padding = {x=0;y=15;}; }; colors = { diff --git a/home/packages/helix/helix.nix b/home/packages/helix/helix.nix index a3516f7..531e9f0 100644 --- a/home/packages/helix/helix.nix +++ b/home/packages/helix/helix.nix @@ -8,7 +8,7 @@ dracula_trans = ./dracula_trans.toml; }; settings = { - theme = "everforest_dark_trans"; + theme = "everforest_dark"; editor = { mouse = true; middle-click-paste = true; diff --git a/home/packages/niri/niri.kdl b/home/packages/niri/niri.kdl index e35eacf..f06214b 100644 --- a/home/packages/niri/niri.kdl +++ b/home/packages/niri/niri.kdl @@ -6,7 +6,6 @@ input { } touchpad { tap - natural-scroll accel-speed 0.0 scroll-method "two-finger" middle-emulation @@ -23,12 +22,13 @@ layout { proportion 0.3333333 proportion 0.5 proportion 0.6666667 + proportion 1.0 } preset-window-heights{ - proportion 0.95 - proportion 0.8 + proportion 1.0 proportion 0.75 proportion 0.5 + proportion 0.25 } default-column-width { proportion 0.6666667; } focus-ring { off; } @@ -39,8 +39,17 @@ layout { urgent-color "#e67e80" } } -spawn-at-startup "waybar" -spawn-at-startup "swaybg -i ~/Downloads/wp.jpg" +window-rule { + geometry-corner-radius 8 + clip-to-geometry true +} +window-rule{ + match app-id="Alacritty" + match is-focused=true + opacity 0.95 +} +// spawn-at-startup "waybar" +spawn-at-startup "swaybg" "-i" "~/Downloads/wp.jpg" spawn-at-startup "avizo-service" binds { //spawn binds @@ -53,6 +62,7 @@ binds { Super+Shift+E hotkey-overlay-title="Quit" {quit;} Super+Q hotkey-overlay-title="Close" {close-window;} Super+O hotkey-overlay-title="Toggle Overview" {toggle-overview;} + Super+KP_Subtract {spawn "swaybg" "-i" "~/Downloads/wp.jpg";} Super+H {focus-column-left;} Super+J {focus-window-down;} @@ -101,4 +111,8 @@ binds { Super+Shift+F {fullscreen-window;} Super+V {toggle-window-floating;} Super+W {toggle-column-tabbed-display;} + Super+Page_Down {focus-workspace-down;} + Super+Page_Up {focus-workspace-up;} + Super+Shift+Page_Down{move-column-to-workspace-down;} + Super+Shift+Page_Up{move-column-to-workspace-up;} } diff --git a/home/packages/waybar/waybar.css b/home/packages/waybar/waybar.css index c6fb755..11a9089 100644 --- a/home/packages/waybar/waybar.css +++ b/home/packages/waybar/waybar.css @@ -39,6 +39,7 @@ button:hover { opacity: 0.8; } +#workspaces button, #tags button { padding: 0 5px; background-color: transparent; @@ -46,12 +47,14 @@ button:hover { margin: 3px; } +#workspaces button.active, #tags button.occupied { background: #d3c6aa; border: 1px solid #2b3339; color: #2b3339; } +#workspaces button.focused, #tags button.focused { background-color: #7fbbb3; color: #2b3339; @@ -83,6 +86,7 @@ button:hover { margin: 0 8px; } + #backlight { background-color: transparent; /* border-bottom: 3px solid #7fbbb3; */ diff --git a/home/packages/waybar/waybar.nix b/home/packages/waybar/waybar.nix index e1f07f0..659727b 100644 --- a/home/packages/waybar/waybar.nix +++ b/home/packages/waybar/waybar.nix @@ -15,10 +15,12 @@ # modules-left = [ "river/tags" + "niri/workspaces" ]; modules-center = [ "custom/currents" "river/window" + "niri/window" ]; modules-right = [ "pulseaudio" @@ -74,11 +76,20 @@ hide-vacant = true; }; + "niri/workspaces" = { + format = "{index}"; + }; + "river/window" = { format = "{}"; max-length = 20; }; - + + "niri/window" = { + format = "{}"; + max-length = 20; + }; + "tray" = { icon-size = 21; spacing = 10; diff --git a/system/defaults/security.nix b/system/defaults/security.nix new file mode 100644 index 0000000..ef9d382 --- /dev/null +++ b/system/defaults/security.nix @@ -0,0 +1,6 @@ +{config, pkgs, ...}: +{ + security.polkit = { + enable = true; + }; +} diff --git a/system/packages/sddm/bincache.nix b/system/packages/sddm/bincache.nix deleted file mode 100644 index c3d852e..0000000 --- a/system/packages/sddm/bincache.nix +++ /dev/null @@ -1,14 +0,0 @@ - -{ config, pkgs, ... }: - -{ - # Configure systems to use Hydra as a binary cache substituter - nix.settings = { - substituters = [ - "http://rhiannon.coven.systems:3000" - ]; - trusted-public-keys = [ - "rhiannon.coven.systems:f8KiECrc7rY3vDMSy7sACyToxRLPECtQTcm6p8LFMPk=" - ]; - }; -} diff --git a/system/services/swaybg.nix b/system/services/swaybg.nix new file mode 100644 index 0000000..5bb7797 --- /dev/null +++ b/system/services/swaybg.nix @@ -0,0 +1,16 @@ +{config, pkgs, ...}: +{ + systemd.user.services.swaybg-autoset = { + enable = true; + description = "start swaybg on login"; + after = ["waybar.service"]; + requires = ["network-online.target"]; + before = ["multi-user.target"]; + wantedBy = ["multi-user.target"]; + serviceConfig = { + ExecStart = "swaybg -i ~/Downloads/wp.jpg"; + User = "autumn"; + Group = "users"; + }; + }; +} diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index 446a8b8..04ed39b 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -9,14 +9,17 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../packages/bincache.nix + # ../packages/bincache.nix #system configs - ../defaults/system.nix - ../defaults/locale.nix ../defaults/boot.nix + ../defaults/locale.nix + ../defaults/security.nix ../defaults/services.nix + ../defaults/system.nix ../defaults/users.nix + ../services/swaybg.nix + #system packages ../packages/sddm/sddm.nix @@ -55,7 +58,11 @@ hardware.graphics = { enable = true; }; - + fileSystems."/mnt/hoardfrost" = { + device = "//10.0.0.217/public"; + fsType = "cifs"; + options = [ "username=autumn" "password=autest" "x-systemd.automount" "noauto"]; + }; hardware.nvidia = { modesetting.enable = true; @@ -71,7 +78,7 @@ }; # hardware.nvidia.prime.intelBusId = "PCI:0@0:2:0"; # hardware.nvidia.prime.nvidiaBusId = "PCI:1@0:0:0"; - # hardware.nvidia.prime.sync.enable = true; + # hardware.nvidia.prime.sync.enable = true;o # hardware.nvidia.prime.offload.enable = false; # hardware.nvidia.prime.offload.enableOffloadCmd = false; @@ -95,6 +102,8 @@ moonlight-qt pcmanfm gvfs + vlc + cifs-utils # wayland # wayland-protocols # libxkbcommon