diff --git a/flake.lock b/flake.lock index 7b884f1..8609948 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1670012284, - "narHash": "sha256-fxKJvdeFZNgGS1UQJLzpd1NrUyBtInv6RkUQu/+xqko=", + "lastModified": 1669353837, + "narHash": "sha256-IaeB7ED6kxbOb7H/FzujPlSXNErbWPfyMV+tslFpBmo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e88e8c7f0c77622bb3704ea38f146a6e353445b6", + "rev": "aa7098087716090efaa89a3966f3c3cdcfe9a9c3", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1669978198, - "narHash": "sha256-U8sZFwIIDFm9w/Kx58sYrIsWpuQUKmkcQmdBkuQ+gkE=", + "lastModified": 1669328018, + "narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", "owner": "nix-community", "repo": "home-manager", - "rev": "71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9", + "rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1670012125, - "narHash": "sha256-wyTWWhsYNs6KfbNVPmAhhmWerK+LKhwJgIL388h7Pr0=", + "lastModified": 1669358063, + "narHash": "sha256-RbYkhehDQSsiP2PSWBAiV4uaYdcfXzQLNegSCePIpdw=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "cb85eea261d7ee9994bcf8d3152b119e730270b9", + "rev": "141456dd89b231aa05dfff9c184f103515cca3b4", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1669929738, - "narHash": "sha256-/j33Qvg9ciN8qfrjuEjs1fB61Av0/3HuQxXdLkoAn8E=", + "lastModified": 1669310613, + "narHash": "sha256-P1OiIdV9BvIwYnRoOd2yI8InMwEbOZuBSZSEFMEJzS0=", "owner": "oxalica", "repo": "nil", - "rev": "ef9bdb801e73ffe95bf7dee69f6c78fcaae34c71", + "rev": "9794a2eb977d872e5eee19187e74d8bf7c48e400", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669791787, - "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=", + "lastModified": 1669320964, + "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1", + "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1669948173, - "narHash": "sha256-hfL2dTSBPVEWH117GTBk/mYCJbaa3FQar3CcTlKQvhc=", + "lastModified": 1669343666, + "narHash": "sha256-PvNbZvkgVmwDG3uDsG0rFbRBcXiPSxdbpHC7mgwcc6s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3d506453ce9c510b12e8dd98781bfaa2ea436772", + "rev": "87fee4b5b0ed4bc7f6db2e878a8c93db8d631e01", "type": "github" }, "original": { diff --git a/home-manager/modules/i3/default.nix b/home-manager/modules/i3/default.nix index d4c2515..5b9b062 100644 --- a/home-manager/modules/i3/default.nix +++ b/home-manager/modules/i3/default.nix @@ -6,7 +6,7 @@ with lib; let cfg = config.eboskma.programs.i3; mod = "Mod4"; - i3lockcmd = "i3lock --image ${toString ./wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png} --color=333333ff --tiling --ignore-empty-password --show-failed-attempts --screen=0 --clock --pass-volume-keys"; + i3lockcmd = "${pkgs.i3lock-color}/bin/i3lock-color --image ${toString ./wallpapers/river-3840.png} --color=333333ff --tiling --ignore-empty-password --show-failed-attempts --screen=0 --clock --pass-volume-keys"; rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh); left = "n"; down = "e"; diff --git a/home-manager/modules/i3/powermenu.sh b/home-manager/modules/i3/powermenu.sh index 9299d4e..30f2789 100755 --- a/home-manager/modules/i3/powermenu.sh +++ b/home-manager/modules/i3/powermenu.sh @@ -18,7 +18,7 @@ exit_wm="" # Variable passed to rofi options="${shutdown}\n${reboot}\n${lock}\n${hibernate}\n${exit_wm}" uptime=$(uptime | awk '{print $1}' || true) -lockcmd="i3lock --ignore-empty-password --show-failed-attempts --clock --color=333333ff --screen=0 --pass-volume-keys --image /home/erwin/.wallpapers/river-3840.png --tiling" +lockcmd="i3lock-color --image /home/erwin/.wallpapers/river-3840.png --color=333333ff --tiling --ignore-empty-password --show-failed-attempts --screen=0 --clock --pass-volume-keys" chosen="$(echo -e "${options}" | rofi -theme power -p "Uptime: ${uptime}" -dmenu -selected-row 2)" diff --git a/machines/mimir/hardware-configuration.nix b/machines/mimir/hardware-configuration.nix index 3adc75e..157b30e 100644 --- a/machines/mimir/hardware-configuration.nix +++ b/machines/mimir/hardware-configuration.nix @@ -50,5 +50,28 @@ }; }; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver = { + videoDrivers = [ "nvidia" ]; + + # Section "Screen" + # Identifier "Screen0" + # Device "Device0" + # Monitor "Monitor0" + # DefaultDepth 24 + # Option "Stereo" "0" + # Option "nvidiaXineramaInfoOrder" "DFP-2" + # Option "metamodes" "DP-4: nvidia-auto-select +3840+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On, AllowGSYNCCompatible=On}, DP-0: nvidia-auto-select +0+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On, AllowGSYNCCompatible=On}" + # Option "SLI" "Off" + # Option "MultiGPU" "Off" + # Option "BaseMosaic" "off" + # SubSection "Display" + # Depth 24 + # EndSubSection + # EndSection + + screenSection = '' + Option "metamodes" "DP-0: nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On, AllowGSYNCCompatible=On}, DP-4: nvidia-auto-select +3840+0 {ForceFullCompositionPipeline=On, AllowGSYNCCompatible=On}" + Option "TripleBuffer" "On" + ''; + }; } diff --git a/users/erwin/work.nix b/users/erwin/work.nix index 7a65490..541ec95 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -88,6 +88,7 @@ in bitwarden blink1-tool bottom + cider fd ffmpeg_5-full git @@ -197,7 +198,7 @@ in windowManager.i3 = { enable = true; package = pkgs.i3-gaps; - extraPackages = with pkgs; [ i3lock-fancy ]; + extraPackages = with pkgs; [ i3lock-color ]; }; };