diff --git a/flake.lock b/flake.lock index a5bcc47..f8a7cb3 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1739614136, + "narHash": "sha256-k0UV2AUL9iTYqdAH871ex2MPzfdTKGbqqbY754qu6M8=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "7dcd5cda34cba135e4851b92bae6deb859af3884", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739570999, + "narHash": "sha256-eCc0/Q4bPpe4/AS+uzIrHLJcR6BxPQ69q2kD0/Qe6rU=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "254d47082e23dbf72fdeca1da6fe1da420f478d8", "type": "github" }, "original": { @@ -505,11 +505,11 @@ ] }, "locked": { - "lastModified": 1738610386, - "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=", + "lastModified": 1739571712, + "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe", + "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", "type": "github" }, "original": { @@ -574,11 +574,11 @@ ] }, "locked": { - "lastModified": 1738277753, - "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1738547333, - "narHash": "sha256-2x4UIDYMVWMN95u6yyQS3hRkn+0G9PLmVxvaxcxvVwQ=", + "lastModified": 1739587053, + "narHash": "sha256-5t51C/uCWxFCrLH9SqrTtt8dkrrHzC39RoFbYqkSGjQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "3a1d7556ae4a7d4f0ad6bfe6610ef132f0d481fc", + "rev": "c5393c24280ca200ba6f4388c44253b33a7e8974", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738471961, - "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "537286c3c59b40311e5418a180b38034661d2536", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -669,11 +669,11 @@ ] }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1739577062, + "narHash": "sha256-u/trdPzJO8UotNq48RbG7m6Pe8761IEMCOY0QidNjY4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "0b2b8b31f69f24e9a75b4b18a32c771a48612d5e", "type": "github" }, "original": { @@ -684,11 +684,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1739484910, + "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "type": "github" }, "original": { @@ -715,11 +715,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -731,11 +731,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -747,11 +747,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738422722, - "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -792,11 +792,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738584851, - "narHash": "sha256-QY/NOH4rnDxmDc7JqOtcawS9irq8T0ADZWWR629bN38=", + "lastModified": 1739527837, + "narHash": "sha256-dsb5iSthp5zCWhdV0aXPunFSCkS0pCvRXMMgTEFjzew=", "owner": "nix-community", "repo": "nixvim", - "rev": "e77af9f81b220e46a5dc1f1faa592c10753a46a6", + "rev": "a39e0a651657046f3b936d842147fa51523b6818", "type": "github" }, "original": { @@ -812,11 +812,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1738362438, - "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", + "lastModified": 1739625902, + "narHash": "sha256-U5DpcPIlNzoWyYZqjMpy7OQ/Ut+2krELLm3oBj2Cdi0=", "owner": "nix-community", "repo": "NUR", - "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", + "rev": "b9aeca8d75e0ef4c57ffd7b2722466c9ebb2bfa5", "type": "github" }, "original": { @@ -887,15 +887,16 @@ "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1738611626, - "narHash": "sha256-IgjqlYPaS8Bg+jc6a691w27XDFhBeM7gkP4eDcR2EBs=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "d513f59da5856978c363d2f82103f708f4a6024d", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { @@ -998,6 +999,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { @@ -1038,11 +1055,11 @@ ] }, "locked": { - "lastModified": 1738070913, - "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix index b9be43b..60786fd 100644 --- a/home-manager/hyprland/default.nix +++ b/home-manager/hyprland/default.nix @@ -1,8 +1,9 @@ { imports = [ - ./hyprland-settings.nix + ./hyprland-settings.nix + ./hyprspace.nix #./hyprland-xwaylandvideobridge.nix not needed anymore - ./waybar.nix - ./hyprlock.nix + ./waybar.nix + ./hyprlock.nix ]; } diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 5de3f11..1de5613 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -77,10 +77,8 @@ in { touchpad = { natural_scroll = true; }; - sensitivity = if osConfig.networking.hostName == "kop-pc" then - -0.4 - else - 0; # -1.0 - 1.0, 0 means no modification. + accel_profile = "flat"; + sensitivity = 0; }; cursor = { no_hardware_cursors = true; }; @@ -115,7 +113,7 @@ in { #blur_passes = 1 #blur_new_optimizations = on - shadow = { + shadow = { enabled = true; range = 4; render_power = 3; diff --git a/home-manager/hyprland/hyprspace.nix b/home-manager/hyprland/hyprspace.nix new file mode 100644 index 0000000..b644134 --- /dev/null +++ b/home-manager/hyprland/hyprspace.nix @@ -0,0 +1,26 @@ +{ config, osConfig, pkgs, inputs, lib, ... }: +let cfg = osConfig.custom.graphical.hyprland; +in { + config = lib.mkIf cfg.enable { + wayland.windowManager.hyprland = { + plugins = [ pkgs.hyprlandPlugins.hyprspace ]; + settings = { + bind = [ + "$mainMod, TAB, overview:toggle" + "$mainMod SHIFT, TAB, overview:toggle, all" + ]; + plugin = [{ + overview = { + affectStrut = false; + hideTopLayers = true; + panelHeight = 250; + showEmptyWorkspace = false; + showNewWorkspace = true; + disableBlur = true; + }; + }]; + }; + }; + }; + +} diff --git a/home-manager/zsh/default.nix b/home-manager/zsh/default.nix index a1a39ce..c37561c 100644 --- a/home-manager/zsh/default.nix +++ b/home-manager/zsh/default.nix @@ -11,7 +11,7 @@ shellAliases = { # TODO: gifsicle -O3 --lossy=30 noita-20240328-191617-1612416266-00316616.gif -o noita-20240328-191617-1612416266.gif backupNoita = - "cp -r ~/.local/share/Steam/steamapps/compatdata/881100/pfx/drive_c/users/steamuser/AppData/LocalLow/Nolla_Games_Noita/save00 /synced/default/backups/noita_save"; + "cp -r ~/.local/share/Steam/steamapps/compatdata/881100/pfx/drive_c/users/steamuser/AppData/LocalLow/Nolla_Games_Noita/* /synced/default/backups/noita_save"; checkTime = "(cd /synced/work_drive/TS && nix run)"; checkWaylandWindowsKDE = "qdbus org.kde.KWin /KWin org.kde.KWin.showDebugConsole"; @@ -28,7 +28,15 @@ dev = "nix-shell --run zsh"; rmt = "trash put"; bat = "bat -P --style plain"; - cdf = "cd $(fd --type d --exclude node_modules --exclude bin --exclude target --exclude .cache . | fzf)"; + cdf = + "cd $(fd --type d --exclude node_modules --exclude bin --exclude target --exclude .cache . | fzf)"; + cpu_performance = + "echo performance | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor"; + cpu_powersave = + "echo powersave | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor"; + cpu_schedutil = + "echo schedutil | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor"; + cpu_freq = ''watch -n 1 "cat /proc/cpuinfo | grep \"^[c]pu MHz\""''; }; #plugins = with pkgs; [ # { diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index 70f1759..811a8c2 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -72,30 +72,16 @@ in { # accessible via `nvidia-settings`. nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - #package = config.boot.kernelPackages.nvidiaPackages.beta; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "570.86.16"; - sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U="; - sha256_aarch64 = "sha256-RiO2njJ+z0DYBo/1DKa9GmAjFgZFfQ1/1Ga+vXG87vA="; - openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE="; - settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8="; - persistencedSha256 = - "sha256-3mp9X/oV8o2TH9720NnoXROxQ4g98nNee+DucXpQy3w="; - }; - #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "560.35.03"; - # sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; - # sha256_aarch64 = "sha256-s8ZAVKvRNXpjxRYqM3E5oss5FdqW+tv1qQC2pDjfG+s="; - # openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; - # settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; - # persistencedSha256 = - # "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; - # preInstall = '' - # rm -f ./libnvidia-egl-wayland.so* - # cp ${pkgs.egl-wayland}/lib/libnvidia-egl-wayland.so.1.* . - # chmod 777 ./libnvidia-egl-wayland.so.1.* - # ''; - #}; + package = config.boot.kernelPackages.nvidiaPackages.beta; + #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "570.86.16"; + # sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U="; + # sha256_aarch64 = "sha256-RiO2njJ+z0DYBo/1DKa9GmAjFgZFfQ1/1Ga+vXG87vA="; + # openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE="; + # settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8="; + # persistencedSha256 = + # "sha256-3mp9X/oV8o2TH9720NnoXROxQ4g98nNee+DucXpQy3w="; + #}; }; environment.systemPackages = with pkgs; [