diff options
| -rw-r--r-- | flake.lock | 83 | ||||
| -rw-r--r-- | hosts/tiamat/home.nix | 4 | ||||
| -rw-r--r-- | modules/home-manager/default.nix | 2 | ||||
| -rw-r--r-- | modules/home-manager/hypr/binds.nix | 1 | ||||
| -rw-r--r-- | modules/home-manager/hypr/decoration.nix | 10 | ||||
| -rw-r--r-- | modules/home-manager/hypr/waybar-hyprland.nix | 8 | ||||
| -rw-r--r-- | modules/nixos/default.nix | 3 | ||||
| -rw-r--r-- | modules/nixos/greetd.nix | 4 |
8 files changed, 53 insertions, 62 deletions
@@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1765606130, - "narHash": "sha256-KOP4QnkiRwiD5KEOr6ceF67rfTP1OqPmCCft6xDC3k4=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d787ec69c3216ea33be1c0424fe65cb23aa8fb31", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -136,14 +136,17 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1765435293, - "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", + "lastModified": 1765720983, + "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", "owner": "feel-co", "repo": "ndg", - "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", + "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", "type": "github" }, "original": { @@ -170,11 +173,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -186,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -218,27 +221,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -274,11 +261,11 @@ ] }, "locked": { - "lastModified": 1765618403, - "narHash": "sha256-qW/jTAo4j1EnCe0avrDfL+kKzenjOs7YWphV1oz/wu0=", + "lastModified": 1767318011, + "narHash": "sha256-LlrCPlrIXrmD6tnwCqFNOV02R0q5GNeKeDvdgjn2vGk=", "owner": "nix-community", "repo": "NUR", - "rev": "1003d297304079e34fd9d2ef3b932fe111fcabd4", + "rev": "14ad694f34c20d69fa9ef720b06d14340a9c0b37", "type": "github" }, "original": { @@ -299,11 +286,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1765538316, - "narHash": "sha256-6xrEkfZZaRSbbEa8dKMs0N+E+0DnNTFlNVRhJ3Cl0SQ=", + "lastModified": 1767123832, + "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=", "owner": "NotAShelf", "repo": "nvf", - "rev": "13b3916c1cac0adf865eaa2624604de1b89f0902", + "rev": "0390abd6736ff34a016afc66366d1f46372f28de", "type": "github" }, "original": { @@ -328,15 +315,15 @@ }, "spicetify": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "systems": "systems_2" }, "locked": { - "lastModified": 1765082296, - "narHash": "sha256-EcefoixU9ht+P6QB/TfjLY9E3MdJVfeSec6G8Ges0pA=", + "lastModified": 1767195736, + "narHash": "sha256-0xvPSbhIGeJzsJXNTkgJ3PjwdVItKm85wzYKA9NmSzI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "ac4927ea1ec7e7ea3635a1d8b933106a596c4356", + "rev": "465adc0ab6ff0c4b9b1db1c6e7fd7eeb553b3261", "type": "github" }, "original": { @@ -383,11 +370,11 @@ ] }, "locked": { - "lastModified": 1765589985, - "narHash": "sha256-jsaE3UG7BpthBJZtaXCCuH1rYdQBauUA3Otv3NF20FM=", + "lastModified": 1767306087, + "narHash": "sha256-WkWPjdXYp9/47xYI9G6TjiXL4fBjUsV1iaCp4U5QhTI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c79311e5b4f299ab3713b23dfbc98c853bb5f070", + "rev": "265a4839a89c59813f3fca130b0d55cc03bb4ead", "type": "github" }, "original": { diff --git a/hosts/tiamat/home.nix b/hosts/tiamat/home.nix index 9122141..7e055d3 100644 --- a/hosts/tiamat/home.nix +++ b/hosts/tiamat/home.nix @@ -58,7 +58,7 @@ wayland.windowManager.hyprland.settings = { monitor = [ - "eDP-1, 2256x1504@60, 0x0, 1.5666667" + "eDP-1, 2880x1920@120, 0x0, 1.666666" ]; workspace = [ @@ -73,7 +73,7 @@ ]; misc = { - vrr = 2; + vrr = 1; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index c9d8268..574aac8 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -42,6 +42,7 @@ vlc ungoogled-chromium audacity + speedtest-cli ]; home.sessionVariables = { @@ -56,6 +57,7 @@ defaultApplications = { "application/pdf" = "userapp-kitty vi-DARLE3.desktop"; + "application/javascript" = "userapp-kitty vi-DARLE3.desktop"; "application/toml" = "userapp-kitty vi-DARLE3.desktop"; "application/vnd.microsoft.portable-executable" = "wine-desktop"; "application/zip" = "lxqt-archiver.desktop"; diff --git a/modules/home-manager/hypr/binds.nix b/modules/home-manager/hypr/binds.nix index 8d2d772..865ac33 100644 --- a/modules/home-manager/hypr/binds.nix +++ b/modules/home-manager/hypr/binds.nix @@ -16,6 +16,7 @@ "$mod, F2, exec, $term" "$mod, F3, exec, $filem" "$mod, F4, killactive," + "$mod SHIFT, F4, exec, hyprctl kill" "$mod, F, fullscreen" "$mod, T, togglefloating" diff --git a/modules/home-manager/hypr/decoration.nix b/modules/home-manager/hypr/decoration.nix index e928a51..e9d5dfe 100644 --- a/modules/home-manager/hypr/decoration.nix +++ b/modules/home-manager/hypr/decoration.nix @@ -16,11 +16,11 @@ "f[1], gapsout:0, gapsin:0" ]; - windowrulev2 = [ - "bordersize 0, floating:0, onworkspace:w[tv1]" - "rounding 0, floating:0, onworkspace:w[tv1]" - "bordersize 0, floating:0, onworkspace:f[1]" - "rounding 0, floating:0, onworkspace:f[1]" + windowrule = [ + "border_size 0, match:float 0, match:workspace w[tv1]" + "rounding 0, match:float 0, match:workspace w[tv1]" + "border_size 0, match:float 0, match:workspace f[1]" + "rounding 0, match:float 0, match:workspace f[1]" ]; }; diff --git a/modules/home-manager/hypr/waybar-hyprland.nix b/modules/home-manager/hypr/waybar-hyprland.nix index 15b8d7c..7941170 100644 --- a/modules/home-manager/hypr/waybar-hyprland.nix +++ b/modules/home-manager/hypr/waybar-hyprland.nix @@ -8,7 +8,7 @@ mainBar = { layer = "top"; position = "top"; - height = 15; + height = 30; modules-left = [ "hyprland/workspaces" "idle_inhibitor" ]; modules-center = [ "hyprland/window" ]; @@ -64,12 +64,12 @@ on-scroll-down = "playerctl --player=spotify_player,spotify previous"; exec = "${pkgs.writeShellScriptBin "spotify-module-script" '' shorten() { - if [ ''${#1} -le 16 ]; then + if [ ''${#1} -le 12 ]; then printf "%s" "$1" else - local truncated="''${1:0:13}" + local truncated="''${1:0:9}" if [ "''${truncated: -1}" = " " ]; then - truncated="''${truncated:0:12}" + truncated="''${truncated:0:8}" fi printf "%s…" "$truncated" fi diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index d3187df..8647dcf 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -11,6 +11,7 @@ ./gaming.nix ./nix-ld.nix # ./nordvpn.nix + # ./ly.nix ]; users.users.jck.packages = with pkgs; [ @@ -53,7 +54,7 @@ gutenprint brgenml1lpr brgenml1cupswrapper - cnijfilter2 + # cnijfilter2 ]; }; diff --git a/modules/nixos/greetd.nix b/modules/nixos/greetd.nix index 97980cb..89d100a 100644 --- a/modules/nixos/greetd.nix +++ b/modules/nixos/greetd.nix @@ -11,8 +11,8 @@ settings = { default_session = { - command = "${pkgs.tuigreet}/bin/tuigreet --user-menu -t --asterisks -c Hyprland"; + command = "${pkgs.tuigreet}/bin/tuigreet --user-menu -t --asterisks -c start-hyprland"; }; }; }; -}
\ No newline at end of file +} |