diff --git a/flake.lock b/flake.lock index cda621c..edfa268 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1716291492, - "narHash": "sha256-Qvfoa99WdYIneGrrLFIKQCevLgB5vnxvwJe5aWbGYZY=", + "lastModified": 1716773194, + "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=", "owner": "nix-community", "repo": "disko", - "rev": "f1654e07728008d354c704d265fc710e3f5f42ee", + "rev": "10986091e47fb1180620b78438512b294b7e8f67", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716881121, + "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716847642, + "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716218643, - "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix index a93cc56..068d33a 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/applications.nix @@ -24,6 +24,12 @@ virtualbox + libreoffice + prusa-slicer + gimp + + cinnamon.nemo-fileroller + ]; } diff --git a/users/willifan/graphical/hyprland/Lenni/kanshi.nix b/users/willifan/graphical/hyprland/Lenni/kanshi.nix index 1df997b..ade1778 100644 --- a/users/willifan/graphical/hyprland/Lenni/kanshi.nix +++ b/users/willifan/graphical/hyprland/Lenni/kanshi.nix @@ -2,7 +2,7 @@ { home-manager.users.willifan = { services.kanshi = { - enable = false; + enable = true; settings = [ { @@ -42,9 +42,6 @@ scale = 1.0; transform = "270"; } - { - criteria = "*"; - } ]; profile.exec = "$XDG_CONFIG_HOME/eww/scripts/monitors.sh"; } diff --git a/users/willifan/graphical/hyprland/common/default.nix b/users/willifan/graphical/hyprland/common/default.nix index 0700cdd..acc305b 100644 --- a/users/willifan/graphical/hyprland/common/default.nix +++ b/users/willifan/graphical/hyprland/common/default.nix @@ -9,6 +9,7 @@ ./pipewire.nix ./polkit.nix ./utils.nix + ./wlogout.nix ./wofi.nix ]; diff --git a/users/willifan/graphical/hyprland/common/wlogout.nix b/users/willifan/graphical/hyprland/common/wlogout.nix new file mode 100644 index 0000000..f605fd2 --- /dev/null +++ b/users/willifan/graphical/hyprland/common/wlogout.nix @@ -0,0 +1,83 @@ +{ pkgs, home-manager, ...}: +{ + home-manager.users.willifan = { + programs.wlogout = { + enable = true; + layout = [ + { + label = "shutdown"; + action = "systemctl poweroff"; + text = "Shutdown"; + } + { + label = "hyprland"; + action = "hyprctl dispatch exit"; + text = "Exit Hyprland"; + } + { + label = "whatever"; + action = ""; + text = "whatever"; + } + { + label = "reboot"; + action = "systemctl reboot"; + text = "Reboot"; + } + { + label = "suspend"; + action = "systemctl suspend"; + text = "Suspend"; + } + { + label = "hibernate"; + action = "systemctl hibernate"; + text = "Hibernate"; + } + ]; + + style = '' + @import url("file:///home/willifan/.config/gtk-4.0/gtk.css"); + * { + background-image: none; + box-shadow: none; + } + + window { + background-color: rgba(12, 12, 12, 0.9); + } + + button { + border-radius: 10px; + border-color: #ffa44b; + border-style: solid; + border-width: 2px; + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + } + + button:focus, button:active, button:hover { + /*background-color: #3700B3;*/ + outline-style: none; + } + + #suspend { + background-image: image(url("/home/willifan/.config/wlogout/suspend.png")); + } + + #hibernate { + background-image: image(url("/home/willifan/.config/wlogout/hibernate.png")); + } + + #shutdown { + background-image: image(url("/home/willifan/.config/wlogout/shutdown.png")); + } + + #reboot { + background-image: image(url("/home/willifan/.config/wlogout/reboot.png")); + } + ''; + }; + }; +} \ No newline at end of file diff --git a/users/willifan/graphical/thunar.nix b/users/willifan/graphical/thunar.nix index ba51967..2a66655 100644 --- a/users/willifan/graphical/thunar.nix +++ b/users/willifan/graphical/thunar.nix @@ -1,6 +1,8 @@ { pkgs, home-manager, ... }: { - services.udisks2.enable = true; + services.gvfs.enable = true; + + programs.file-roller.enable = true; programs.thunar = { enable = true;