1
1
Fork 0

Compare commits

..

No commits in common. "4a4a5186c5bfd1835c952626208a82f334e54461" and "d3f2fcb28e92fd190e5c7288abfd4a37bb11b0d6" have entirely different histories.

6 changed files with 54 additions and 70 deletions

View file

@ -61,13 +61,13 @@
bitwarden-menu = flake "github:firecat53/bitwarden-menu" // unstable "nixpkgs"; bitwarden-menu = flake "github:firecat53/bitwarden-menu" // unstable "nixpkgs";
fw-fanctrl = flake "github:TamtamHero/fw-fanctrl/packaging/nix" // unstable "nixpkgs"; fw-fanctrl = flake "github:TamtamHero/fw-fanctrl/packaging/nix" // unstable "nixpkgs";
hypridle = flake "github:hyprwm/hypridle" // unstable "nixpkgs"; hypridle = flake "github:hyprwm/hypridle" // unstable "nixpkgs";
#// hyprland = flake "git+https://github.com/hyprwm/Hyprland?submodules=1" // unstable "nixpkgs"; hyprland = flake "git+https://github.com/hyprwm/Hyprland?submodules=1" // unstable "nixpkgs";
hyprland = # hyprland =
flake "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.43.0&submodules=1" # flake "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.41.2&submodules=1"
// unstable "nixpkgs"; # // unstable "nixpkgs";
#// hyprland = # hyprland =
#// flake "git+https://github.com/UjinT34/Hyprland?ref=vrr-cursor-fix&submodules=1" # flake "git+https://github.com/UjinT34/Hyprland?ref=vrr-cursor-fix&submodules=1"
#// // unstable "nixpkgs"; # // unstable "nixpkgs";
hyprland-contrib = flake "github:hyprwm/contrib" // unstable "nixpkgs"; hyprland-contrib = flake "github:hyprwm/contrib" // unstable "nixpkgs";
hyprland-plugins = hyprland-plugins =
flake "github:hyprwm/hyprland-plugins" // unstable "nixpkgs" // follows "hyprland"; flake "github:hyprwm/hyprland-plugins" // unstable "nixpkgs" // follows "hyprland";

83
flake.lock generated
View file

@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725712445, "lastModified": 1725307913,
"narHash": "sha256-m0sOGHvkKCzO+EzHOjpQ/Lvkp126Rt6vwioCTwV95Yg=", "narHash": "sha256-Slc+vPJFiarviylZsq3FgaWRPeeKHTrT6J0NpHvDfgg=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "49e1dd54d3ac9b858d3be597a2fbc48ab67fa6e8", "rev": "f8e7957aa7d4651d5df7b50299cb9b6f4b51adfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1725841979, "lastModified": 1721306136,
"narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=", "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796", "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1000,11 +1000,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725703823, "lastModified": 1720042825,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1021,11 +1021,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725831139, "lastModified": 1725180166,
"narHash": "sha256-9syY5nEehCswE8AMcjpUO4T0iX9nrNbzq69Kqcs92L0=", "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a175a89137fe798b33c476d4dae17dba5fb3fd3", "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1100,17 +1100,16 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1725814101, "lastModified": 1725580992,
"narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=", "narHash": "sha256-0g6lzfyIcRaHlDuiWTVy9ZGWtIhIpdqHUTTGtAVR+4Q=",
"ref": "refs/tags/v0.43.0", "ref": "refs/heads/main",
"rev": "0f594732b063a90d44df8c5d402d658f27471dfe", "rev": "b0fca6eaf00a2c5061f499c76ec8d60772b6a719",
"revCount": 5196, "revCount": 5191,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"ref": "refs/tags/v0.43.0",
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -1636,11 +1635,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725600800, "lastModified": 1725559615,
"narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", "narHash": "sha256-q24lAKpBubomTHcNKLoVyvnNwVJJyBwcb/Gkhl0LLbs=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", "rev": "45e6dcff8489d75941468462c41fad0948a2c94b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1797,11 +1796,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725765290, "lastModified": 1725161148,
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "642275444c5a9defce57219c944b3179bf2adaa9", "rev": "32058e9138248874773630c846563b1a78ee7a5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1817,11 +1816,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725765290, "lastModified": 1725161148,
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "642275444c5a9defce57219c944b3179bf2adaa9", "rev": "32058e9138248874773630c846563b1a78ee7a5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1862,11 +1861,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725846341, "lastModified": 1725500139,
"narHash": "sha256-9dM10K+/UjUced7QMIypJYO+9Ak7W4oQla0bxlHUkXw=", "narHash": "sha256-drJz8wZ5RORqtPMnYOMZAQZ43SfrMxMnH5EmQMlVV3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "cbede7bd47cea4f713d44f360fe2516f2dd733e2", "rev": "33839dcc1d5a9243fb5c18ed72b0e200501b31ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1931,11 +1930,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725716377, "lastModified": 1725477728,
"narHash": "sha256-7NzW9O/cAw7iWzRfh7Oo/SuSudL4a1YTKS6yoh3tMck=", "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "04a1cda0c1725094a4db703cccbb956b7558f5a6", "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2060,11 +2059,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1725693463, "lastModified": 1725407940,
"narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68e7dce0a6532e876980764167ad158174402c6f", "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2076,11 +2075,11 @@
}, },
"nixpkgs-staging-next": { "nixpkgs-staging-next": {
"locked": { "locked": {
"lastModified": 1725840878, "lastModified": 1725581600,
"narHash": "sha256-zB1Tl3fiUuFq/deNTmGOltPB4CVsqIQhKA+WTdVDrIU=", "narHash": "sha256-SAnRL9IF1FDJ1pKaNplkxLivOpkav413pAnwrFToQAU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f2b767ea43ee35d063a86b041d984ebb45a042d0", "rev": "25ef10109d198d1a6eac732c83cce8157c53ee98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2092,11 +2091,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1725432240,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -65,7 +65,7 @@
}; };
hyprland = { hyprland = {
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
url = "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.43.0&submodules=1"; url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
}; };
hyprland-contrib = { hyprland-contrib = {
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";

View file

@ -111,10 +111,7 @@ in
"suppressevent maximize" "suppressevent maximize"
"syncfullscreen" "syncfullscreen"
]) ])
(floating true [ (floating true [ "bordercolor rgb(073642)" ])
"bordercolor rgb(073642)"
"workspace special:scratchpad"
])
(fullscreen true [ "idleinhibit focus" ]) (fullscreen true [ "idleinhibit focus" ])
(pinned true [ "bordercolor rgb(073642) rgb(073642)" ]) (pinned true [ "bordercolor rgb(073642) rgb(073642)" ])
@ -127,7 +124,6 @@ in
(tag "browser" [ (tag "browser" [
"group new lock" "group new lock"
"tile" "tile"
"workspace unset"
]) ])
(tag "clipboard" [ (tag "clipboard" [
"move ${clipboard.x} ${clipboard.y}" "move ${clipboard.x} ${clipboard.y}"
@ -139,12 +135,10 @@ in
"move ${dropdown.x} ${dropdown.y}" "move ${dropdown.x} ${dropdown.y}"
"pin" "pin"
"size ${dropdown.w} ${dropdown.h}" "size ${dropdown.w} ${dropdown.h}"
"workspace special:dropdown"
]) ])
(tag "editor" [ (tag "editor" [
"group invade" "group invade"
"tile" "tile"
"workspace unset"
]) ])
(tag "files" [ (tag "files" [
"size 1000 625" "size 1000 625"
@ -170,13 +164,9 @@ in
(tag "social" [ (tag "social" [
"group" "group"
"tile" "tile"
"workspace unset"
]) ])
(tag "steam" [ "workspace special:steam" ]) (tag "steam" [ "workspace special:steam" ])
(tag "terminal" [ (tag "terminal" [ "tile" ])
"tile"
"workspace unset"
])
(tag "vm" [ "workspace special:vm" ]) (tag "vm" [ "workspace special:vm" ])
(tag "wine" [ (tag "wine" [
"noborder" "noborder"
@ -198,10 +188,7 @@ in
(class "Element" [ "tag +social" ]) (class "Element" [ "tag +social" ])
(class "foot" [ "tag +terminal" ]) (class "foot" [ "tag +terminal" ])
(class "kitty" [ "tag +terminal" ]) (class "kitty" [ "tag +terminal" ])
(class "libreoffice.+" [ (class "libreoffice.+" [ "tile" ])
"tile"
"workspace unset"
])
(class "moe\\.launcher\\.the-honkers-railway-launcher" [ (class "moe\\.launcher\\.the-honkers-railway-launcher" [
"size 1280 730" "size 1280 730"
"tag +game" "tag +game"

View file

@ -122,7 +122,7 @@ in
"col.shadow_inactive" = "rgba(0000001a)"; "col.shadow_inactive" = "rgba(0000001a)";
"col.shadow" = "rgba(00000040)"; "col.shadow" = "rgba(00000040)";
blur.enabled = false; blur.enabled = false;
dim_special = 0; dim_special = 0.5;
rounding = 12; rounding = 12;
shadow_range = 50; shadow_range = 50;
shadow_render_power = 4; # Distance falloff shadow_render_power = 4; # Distance falloff
@ -176,7 +176,6 @@ in
repeat_rate = 40; repeat_rate = 40;
sensitivity = 0.5; sensitivity = 0.5;
#// scroll_factor = 0.75; #// scroll_factor = 0.75;
special_fallthrough = true; # Alternative to toggle script
touchpad = { touchpad = {
clickfinger_behavior = true; # Multi-finger clicks clickfinger_behavior = true; # Multi-finger clicks

View file

@ -26,14 +26,13 @@ in
inactive_tab_font_style = "normal"; inactive_tab_font_style = "normal";
confirm_os_window_close = 0; confirm_os_window_close = 0;
cursor_blink_interval = 0; cursor_blink_interval = 0;
placement_strategy = "top-left"; # Partially fix padding
scrollback_lines = -1; scrollback_lines = -1;
strip_trailing_spaces = "smart"; strip_trailing_spaces = "smart";
tab_bar_style = "powerline"; tab_bar_style = "powerline";
touch_scroll_multiplier = 3; touch_scroll_multiplier = 3;
url_style = "straight"; url_style = "straight";
wayland_enable_ime = "no"; wayland_enable_ime = "no";
window_padding_width = "2.5 5"; # top/bottom left/right window_padding_width = "0 5 5 5"; # top right bottom left
# Solarized Dark colors # Solarized Dark colors
# https://ethanschoonover.com/solarized/ # https://ethanschoonover.com/solarized/