outfoxxed/nixnew
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

system update and various missed changes

Browse source
This commit is contained in:
outfoxxed 2024-03-08 05:13:08 -08:00
parent d388842a87
commit 1dd031aa6b
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
6 changed files with 204 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

255
flake.lock
View file

@ -1,5 +1,42 @@
{ {
"nodes": { "nodes": {
"advisory-db": {
"flake": false,
"locked": {
"lastModified": 1701193254,
"narHash": "sha256-Hr7efA3GjwqBkGYKmd3XmGckdPQikbcCmOrq7fmTp3A=",
"owner": "rustsec",
"repo": "advisory-db",
"rev": "43af5fef0591531a72ebb86c5f1c623ee95c62fe",
"type": "github"
},
"original": {
"owner": "rustsec",
"repo": "advisory-db",
"type": "github"
}
},
"crane": {
"inputs": {
"nixpkgs": [
"radicle",
"nixpkgs"
]
},
"locked": {
"lastModified": 1701622587,
"narHash": "sha256-o3XhxCCyrUHZ0tlta2W7/MuXzy+n0+BUt3rKFK3DIK4=",
"owner": "ipetkov",
"repo": "crane",
"rev": "c09d2cbe84cc2adfe1943cb2a0b55a71c835ca9a",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -11,11 +48,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1707961509, "lastModified": 1709715989,
"narHash": "sha256-ux65xSnbGnMDpNYSfnBbMFrE8xHYVm3wnXXeEeLo0ic=", "narHash": "sha256-x8nsKGkLCq+i1pHj+Jr29GpPkYQrVQjrvJ7Kb3ogY30=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "3ca8fd85438bf9e717628f519044b56d54e56911", "rev": "984860d0f4f5c3a6d1d92d0ac3cd1c081408e138",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,6 +61,30 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"radicle",
"nixpkgs"
],
"rust-analyzer-src": [
"radicle"
]
},
"locked": {
"lastModified": 1701930186,
"narHash": "sha256-t9uIiU1fE7VXi3t460iOuAUW8Ece9mowRKva1aw48zI=",
"owner": "nix-community",
"repo": "fenix",
"rev": "aeb764a8e4c16da3f36b200a302552d8e457b9f4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -50,11 +111,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1709126324,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707919853, "lastModified": 1709722441,
"narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "narHash": "sha256-OdkGhZ+OrOEZWsLyGLNVWS0sQF0adPXCkkwhy8vlEuo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "043ba285c6dc20f36441d48525402bcb9743c498", "rev": "1d717f581b7b001b2a1293277a1d3386fca5b87e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,30 +169,10 @@
"type": "github" "type": "github"
} }
}, },
"hyprfocus": {
"inputs": {
"hyprland": [
"hyprland"
],
"nix-filter": "nix-filter"
},
"locked": {
"lastModified": 1698854678,
"narHash": "sha256-JuUNQXUetKIUGGwzEA5dQmKtpFvYSZzG/IV373aKd6U=",
"owner": "VortexCoyote",
"repo": "hyprfocus",
"rev": "ec3b45482f651c2b1f0e4df90a41d24a1afa5a74",
"type": "github"
},
"original": {
"owner": "VortexCoyote",
"repo": "hyprfocus",
"type": "github"
}
},
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -140,12 +181,12 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1707962500, "dirtyRev": "d6f1b151b2fe85ffbb131cbdd05acefc6a357e81-dirty",
"narHash": "sha256-RT/ltuugm8j0zQAsvM+d70HisZvzcofrzHFtxzG++vw=", "dirtyShortRev": "d6f1b151-dirty",
"owner": "hyprwm", "lastModified": 1709720053,
"repo": "Hyprland", "narHash": "sha256-jAzU4nq4BJDcYZ6RE33vSLe6pRWiXfa1mZ0DD67F79w=",
"rev": "a42b984f51a00e88a13a45e1b5e9e3d4ec470254", "type": "git",
"type": "github" "url": "file:///home/admin/programming/outfoxxed/hyprland/hyprland"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
@ -160,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707913427, "lastModified": 1709723828,
"narHash": "sha256-M8o3kPqGa/jfNNtvHFldbS3l+T9RC6AhJl2nErwKYkQ=", "narHash": "sha256-tx8Oslh1qeCRpysJYYc8WslI5qVkvaFP33QiDiSsHz0=",
"owner": "outfoxxed", "owner": "outfoxxed",
"repo": "hy3", "repo": "hy3",
"rev": "f231373aeef1ab170f10b65458fa8fd0275cc4c8", "rev": "890443f504419ec12c7591f7ef17cbea9d34c9ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,16 +243,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"xdph",
"nixpkgs" "nixpkgs"
],
"systems": [
"hyprland",
"systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1704287638, "lastModified": 1708787654,
"narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", "rev": "0fce791ba2334aca183f2ed42399518947550d0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -244,11 +288,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1707095251, "lastModified": 1709070328,
"narHash": "sha256-ISuBw43oGTmQhYM+qneXU39GpWnoRpq5Siw18QZdP2E=", "narHash": "sha256-gTpeu+UZZm/zeM7TRkaPhpUY5aK5Lk3Ybu77zhE1Aas=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprpaper", "repo": "Hyprpaper",
"rev": "1013a80608891f120184aa7c1a7cfde04bfc96fb", "rev": "09c4062659cfaf1bb5ba92532a17e1d131f3b3d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,18 +316,23 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": { "nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1694857738, "lastModified": 1709708644,
"narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
"owner": "numtide", "owner": "Mic92",
"repo": "nix-filter", "repo": "nix-index-database",
"rev": "41fd48e00c22b4ced525af521ead8792402de0ea", "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "Mic92",
"repo": "nix-filter", "repo": "nix-index-database",
"type": "github" "type": "github"
} }
}, },
@ -296,11 +345,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707358904, "lastModified": 1708597894,
"narHash": "sha256-WYP9+8nHYWmBh3tsQhos7GJ+SozP9/jv0dZsQLYlwo0=", "narHash": "sha256-KxpKOBDGPJ76k37vLukYHp/wd7U4DoUVIvy8atHfy/k=",
"owner": "nixpak", "owner": "nixpak",
"repo": "nixpak", "repo": "nixpak",
"rev": "903020fdc3e77e896404a2888f4b896638400854", "rev": "535dd408c4b19f407bc22e42eb32ccb9256e5865",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +376,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1707786466, "lastModified": 1709569716,
"narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=", "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01885a071465e223f8f68971f864b15829988504", "rev": "617579a787259b9a6419492eaac670a5f7663917",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +408,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1707863367, "lastModified": 1709479366,
"narHash": "sha256-LdBbCSSP7VHaHA4KXcPGKqkvsowT2+7W4jlEHJj6rPg=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "35ff7e87ee05199a8003f438ec11a174bcbd98ea", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,11 +423,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1707962215, "lastModified": 1709722017,
"narHash": "sha256-JqlV5Lp3yNcoz/LwcGGrJPz4CCEO8TySzJ6ZNb56G3o=", "narHash": "sha256-M9ec9GkPGuPpblnZI4vWXvF6qlgh8VSMwYw8odYYFfo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b615de6a536e385b08627ae2e0d92a338c95819f", "rev": "e4ea33b9aa652e2871fbc604d1d611e6f5940a66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,19 +436,66 @@
"type": "github" "type": "github"
} }
}, },
"quickshell": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dirtyRev": "f32b4175fbc25bf9cf022c8edffe74696ecb5abb-dirty",
"dirtyShortRev": "f32b417-dirty",
"lastModified": 1709821149,
"narHash": "sha256-ZBKOlWd8sBG3bArCVM6squuJkVblGn3p0gy176KRoxg=",
"type": "git",
"url": "file:///home/admin/programming/outfoxxed/qtshell"
},
"original": {
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}
},
"radicle": {
"inputs": {
"advisory-db": "advisory-db",
"crane": "crane",
"fenix": "fenix",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1708953793,
"narHash": "sha256-DGgH8+ibr1WspyUeKeHaW87VzYHf9jzzjyFlOeT6ZoA=",
"ref": "refs/heads/master",
"rev": "a48081f2717f069d456ec09f31d9e639b232dbed",
"revCount": 1712,
"type": "git",
"url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
},
"original": {
"type": "git",
"url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
}
},
"root": { "root": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprfocus": "hyprfocus",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-hy3": "hyprland-hy3", "hyprland-hy3": "hyprland-hy3",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"impurity": "impurity", "impurity": "impurity",
"nix-index-database": "nix-index-database",
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"quickshell": "quickshell",
"radicle": "radicle",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"stable": "stable" "stable": "stable"
} }
@ -414,11 +510,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707876656, "lastModified": 1709691047,
"narHash": "sha256-urnZg6e2JjziBosarDB1MnjPeVqcu3PeSqIpqQKYrdg=", "narHash": "sha256-2Vwx1FLufoMEcOS8KAwP8H83IP3Hw6ZPrIDHkSXrFCY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3ad32bb27c700b59306224e285b66577e3532dfc", "rev": "d55139f3061cdf2c8f5f7bc8d49e884826e6a4ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,18 +572,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1706359063, "lastModified": 1708558866,
"narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -497,7 +593,10 @@
"hyprland", "hyprland",
"hyprland-protocols" "hyprland-protocols"
], ],
"hyprlang": "hyprlang", "hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
@ -508,11 +607,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706521509, "lastModified": 1708696469,
"narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View file

@ -4,6 +4,11 @@
stable.url = "nixpkgs/nixos-23.05"; stable.url = "nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -22,6 +27,12 @@
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
radicle = {
url = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -32,9 +43,9 @@
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
}; };
hyprfocus = { quickshell = {
url = "github:VortexCoyote/hyprfocus"; url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
inputs.hyprland.follows = "hyprland"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprpaper = { hyprpaper = {

2
modules/hyprland/default.nix
View file

@ -79,7 +79,7 @@ in {
enable = true; enable = true;
package = wrapper; package = wrapper;
plugins = [ hyprland-hy3.packages.${system}.default inputs.hyprfocus.packages.${system}.default ]; plugins = [ hyprland-hy3.packages.${system}.default ];
extraConfig = '' extraConfig = ''
exec-once = ${hyprpaper.packages.${system}.default}/bin/hyprpaper exec-once = ${hyprpaper.packages.${system}.default}/bin/hyprpaper

35
modules/hyprland/hyprland.conf
View file

@ -3,13 +3,11 @@ exec = systemctl start --user emacs.service && emacsclient -e "(setenv \"HYPRLAN
general { general {
gaps_in = 3 gaps_in = 3
gaps_out = 5 gaps_out = 5
border_size = 2 border_size = 1
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg col.active_border = rgba(33ccffee)
col.inactive_border = rgba(595959aa) col.inactive_border = rgba(595959aa)
resize_on_border = true resize_on_border = true
extend_border_grab_area = 5;
layout = hy3 layout = hy3
} }
@ -72,8 +70,8 @@ binds {
plugin { plugin {
hy3 { hy3 {
tabs { tabs {
height = 5 height = 2
padding = 8 padding = 6
render_text = false render_text = false
} }
@ -83,25 +81,6 @@ plugin {
trigger_height = 500 trigger_height = 500
} }
} }
hyprfocus {
enabled = false
keyboard_focus_animation = shrink
bezier = bezIn, 0.5,0.0,1.0,0.5
bezier = bezOut, 0.0,0.5,0.5,1.0
shrink {
shrink_percentage = 0.99
in_bezier = bezIn
in_speed = 1
out_bezier = bezOut
out_speed = 3
}
}
} }
debug { debug {
@ -110,6 +89,10 @@ debug {
monitor = , preferred, auto, 1 monitor = , preferred, auto, 1
layerrule = blur, test
layerrule = ignorezero, test
layerrule = noanim, test
layerrule = blur, wofi layerrule = blur, wofi
layerrule = ignorezero, wofi layerrule = ignorezero, wofi
layerrule = noanim, ^(selection)$ layerrule = noanim, ^(selection)$
@ -252,4 +235,4 @@ bind = $mod+CONTROL, 6, hy3:focustab, index, 06
bind = $mod+CONTROL, 7, hy3:focustab, index, 07 bind = $mod+CONTROL, 7, hy3:focustab, index, 07
bind = $mod+CONTROL, 8, hy3:focustab, index, 08 bind = $mod+CONTROL, 8, hy3:focustab, index, 08
bind = $mod+CONTROL, 9, hy3:focustab, index, 09 bind = $mod+CONTROL, 9, hy3:focustab, index, 09
bind = $mod+CONTROL, 0, hy3:focustab, index, 10 bind = $mod+CONTROL, 0, hy3:focustab, index, 10

2
modules/hyprland/lockscreen/Lockscreen.qml
View file

@ -1,5 +1,7 @@
import QtQuick import QtQuick
import QtQuick.Controls.Universal import QtQuick.Controls.Universal
import QtQuick.Layouts
import Quickshell
Item { Item {
required property AuthContext context required property AuthContext context

1
modules/hyprland/lockscreen/shell.qml
View file

@ -17,6 +17,7 @@ ShellRoot {
locked: true locked: true
SessionLockSurface { SessionLockSurface {
id: surface
Image { Image {
anchors.fill: parent anchors.fill: parent
source: screen.name == "DP-1" ? "../5120x1440.png" : "../1920x1080.png" source: screen.name == "DP-1" ? "../5120x1440.png" : "../1920x1080.png"