diff --git a/configuration.nix b/configuration.nix index cc10179..13a3f60 100644 --- a/configuration.nix +++ b/configuration.nix @@ -36,6 +36,18 @@ fileSystems."mnt/win" = { options = ["rw" "uid=1000"]; }; +# hibernation +swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 16 * 1024; + } +]; + +boot.resumeDevice = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31"; + +powerManagement.enable = true; + # Flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -46,7 +58,7 @@ fileSystems."mnt/win" = { # "127.0.0.1,localhost,internal.domain"; # Enable networking - boot.kernelParams = [ "ipv6.disable=1" ]; + boot.kernelParams = [ "ipv6.disable=1" "resume_offset=94015488"]; networking.networkmanager.enable = true; networking.hostName = "nixos"; # Define your hostname. networking.enableIPv6 = false; @@ -144,6 +156,7 @@ services.mullvad-vpn.enable = true; "wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [ ]; }; + users.defaultUserShell = pkgs.zsh; environment.shells = with pkgs; [ zsh nushell ]; programs.zsh.enable = true; diff --git a/packages/niri/config.kdl b/packages/niri/config.kdl index de2505b..6149ed6 100644 --- a/packages/niri/config.kdl +++ b/packages/niri/config.kdl @@ -3,8 +3,17 @@ cursor { xcursor-size 30 } +// Mod+O Overview +// Make workspaces four times smaller than normal in the overview. +overview { + zoom 0.5 + backdrop-color "#1e1e2e" +} - +// Disable hotkey overlay at startup: +hotkey-overlay { + skip-at-startup +} // This config is in the KDL format: https://kdl.dev // "/-" comments out the following node. @@ -210,7 +219,7 @@ layout { // You can enable drop shadows for windows. shadow { // Uncomment the next line to enable shadows. - // on +// on // By default, the shadow draws only around its window, and not behind it. // Uncomment this setting to make the shadow draw behind its window. @@ -252,7 +261,7 @@ layout { struts { // left 64 // right 64 - // top 64 + top -6 // bottom 64 } } @@ -295,7 +304,7 @@ animations { // off // Slow down all animations by this factor. Values below 1 speed them up instead. - // slowdown 3.0 + slowdown 0.8 } // Window rules let you adjust behavior for individual windows. diff --git a/packages/terminal/default.nix b/packages/terminal/default.nix index 3867cc0..1d5b9c0 100644 --- a/packages/terminal/default.nix +++ b/packages/terminal/default.nix @@ -6,7 +6,6 @@ ]; - programs.nushell = { enable = false; extraConfig = '' diff --git a/packages/waybar/config b/packages/waybar/config index 714dbe9..33d6c96 100644 --- a/packages/waybar/config +++ b/packages/waybar/config @@ -3,19 +3,42 @@ "position": "top", "height": 38, "spacing": 0, - "modules-left": ["clock", "niri/workspaces", "hyprland/submap"], + "modules-left": ["clock", "niri/workspaces"], "modules-center": [ ], - "modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"], + "modules-right": [ + "network", + "custom/separator", + "cpu", + "custom/separator", + "memory", + "custom/separator", + "custom/notification", + "custom/separator", + "pulseaudio", + "custom/separator", + "tray" + ], -"custom/keyboard-layout": { - "interval": 1, - "exec": "hyprctl devices -j | jq -r '.keyboards[] | .active_keymap' | head -n1 | cut -c1-2 | tr 'a-z' 'A-Z'" -}, + "tray": { + "spacing": 10, + "show-passive-items": true + }, -"custom/notification": { - "on-click": "swaync-client -t", - "format": "♥" -}, + "custom/keyboard-layout": { + "interval": 1, + "exec": "hyprctl devices -j | jq -r '.keyboards[] | .active_keymap' | head -n1 | cut -c1-2 | tr 'a-z' 'A-Z'" + }, + + "custom/separator": { + "format": "|", + "interval": "once", + "tooltip": false + }, + + "custom/notification": { + "on-click": "swaync-client -t", + "format": "♥" + }, "cpu": { "interval": 5, @@ -39,8 +62,11 @@ }, "network": { - "format-wifi": " {essid} {signalStrength}%", - "format-disconnected": " No Connection" + "interval": 1, + "format": "{ifname}", + "format-wifi": " {signalStrength}%  {bandwidthDownBytes}  {bandwidthUpBytes} {ipaddr} {essid}", + "format-disconnected": "No Connection", + "format-ethernet": " {bandwidthDownBytes}  {bandwidthUpBytes} {ipaddr}" } diff --git a/packages/waybar/style.css b/packages/waybar/style.css index eedb129..bd7ec94 100644 --- a/packages/waybar/style.css +++ b/packages/waybar/style.css @@ -11,7 +11,8 @@ window#waybar { /* background: rgba(0,130,130,0); */ - background: @base; + /* background: rgba(0,0,0,0.9); */ + background: transparent; } #clock, @@ -25,14 +26,22 @@ window#waybar { #custom-notification, #tray, #battery{ - background: rgba(10,10,10,100); - opacity: 0.8; + /* background: rgba(10,10,10,100); */ + background: @crust; + /* opacity: 0.8; */ /* color: #00ffff; */ color: @mauve; padding: 0px 10px ; margin: 3px 0px; } +#custom-separator { + background: @crust; + color: @mauve; + padding: 0px 2px ; + margin: 1px 0px; +} + #workspaces button{ color: @mauve; border-radius: 7px; @@ -62,11 +71,11 @@ window#waybar { background: none; } -#network{ +#network { border-radius: 10px 0px 0px 10px; } -#tray{ +#tray { border-radius: 0px 10px 10px 0px; margin-right: 5px }