update things...

This commit is contained in:
zack 2024-09-18 15:32:57 -04:00
parent ae2ea826ea
commit 380a0a7e0e
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
7 changed files with 338 additions and 65 deletions

341
flake.lock generated
View file

@ -64,6 +64,39 @@
"type": "github"
}
},
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1726665257,
"narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"blog": {
"inputs": {
"nixpkgs": "nixpkgs_2",
@ -406,7 +439,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_7"
"systems": "systems_8"
},
"locked": {
"lastModified": 1705309234,
@ -424,7 +457,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_8"
"systems": "systems_9"
},
"locked": {
"lastModified": 1681202837,
@ -442,7 +475,7 @@
},
"flake-utils_4": {
"inputs": {
"systems": "systems_9"
"systems": "systems_10"
},
"locked": {
"lastModified": 1710146030,
@ -460,7 +493,7 @@
},
"flake-utils_5": {
"inputs": {
"systems": "systems_12"
"systems": "systems_13"
},
"locked": {
"lastModified": 1694529238,
@ -611,6 +644,35 @@
"type": "github"
}
},
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1722623071,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hypridle": {
"inputs": {
"hyprlang": "hyprlang",
@ -634,6 +696,60 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4",
"systems": "systems_7",
"xdph": "xdph"
},
"locked": {
"lastModified": 1726681673,
"narHash": "sha256-n7EMRe/uMZ4QdM/DWsewc7LLRaR0GGzQIV3uu9BFZbU=",
"ref": "refs/heads/main",
"rev": "e6cf643f5ab1c1545fb858ab1fd9d7538ef9e0f3",
"revCount": 5235,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
"locked": {
"lastModified": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
@ -663,6 +779,35 @@
"type": "github"
}
},
"hyprlang_2": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725997860,
"narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
@ -688,6 +833,56 @@
"type": "github"
}
},
"hyprutils_2": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1724966483,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721324119,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"kb-gui": {
"inputs": {
"flake-utils": [
@ -767,7 +962,7 @@
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1726464450,
@ -803,7 +998,7 @@
"inputs": {
"flake-parts": "flake-parts_5",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_8",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -958,7 +1153,7 @@
"flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1726524292,
@ -975,6 +1170,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1712883908,
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1718428119,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
@ -990,7 +1201,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
@ -1039,6 +1250,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1725983898,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -1054,7 +1281,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1726396940,
"narHash": "sha256-EpiSl9nSINTmIW6MG6CulGwNAa6sHrBt8gQdyHUXzR4=",
@ -1070,7 +1297,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
@ -1086,7 +1313,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1723221148,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
@ -1102,7 +1329,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
@ -1118,22 +1345,6 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1712883908,
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pnpm2nix": {
"inputs": {
"flake-utils": "flake-utils",
@ -1186,8 +1397,8 @@
},
"resume": {
"inputs": {
"nixpkgs": "nixpkgs_9",
"systems": "systems_10"
"nixpkgs": "nixpkgs_10",
"systems": "systems_11"
},
"locked": {
"lastModified": 1721842409,
@ -1210,7 +1421,7 @@
"nixpkgs"
],
"rust-overlay": "rust-overlay_3",
"systems": "systems_11"
"systems": "systems_12"
},
"locked": {
"lastModified": 1726522756,
@ -1235,18 +1446,19 @@
"catppuccin": "catppuccin",
"home-manager": "home-manager_2",
"hypridle": "hypridle",
"hyprland": "hyprland",
"kb-gui": "kb-gui",
"lanzaboote": "lanzaboote",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-wayland": "nixpkgs-wayland",
"resume": "resume",
"rio-term": "rio-term",
"snowfall-lib": "snowfall-lib",
"spicetify-nix": "spicetify-nix",
"systems": "systems_13",
"systems": "systems_14",
"waybar": "waybar",
"zen-browser": "zen-browser"
}
@ -1254,7 +1466,7 @@
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1709259239,
@ -1297,7 +1509,7 @@
},
"rust-overlay_3": {
"inputs": {
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1726280639,
@ -1387,7 +1599,6 @@
}
},
"systems_11": {
"flake": false,
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1403,6 +1614,7 @@
}
},
"systems_12": {
"flake": false,
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1432,6 +1644,21 @@
"type": "github"
}
},
"systems_14": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
@ -1509,16 +1736,16 @@
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"repo": "default-linux",
"type": "github"
}
},
@ -1595,9 +1822,39 @@
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1726046979,
"narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1726001766,

View file

@ -50,10 +50,10 @@
catppuccin.url = "github:catppuccin/nix";
# hyprland = {
# url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# inputs.nixpkgs.follows = "nixpkgs";
# };
hyprland = {
url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# inputs.nixpkgs.follows = "nixpkgs";
};
kb-gui = {
url = "github:zackartz/kb-gui";

View file

@ -42,7 +42,7 @@ in {
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
package = pkgs-unstable.hyprland;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
systemd = {
enable = true;
@ -58,7 +58,7 @@ in {
exec-once = [
"pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\""
"sway-audio-idle-inhibit"
"${pkgs.librewolf}/bin/librewolf"
"zen"
"telegram"
"thunderbird"
"vesktop"

View file

@ -71,8 +71,8 @@ in {
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-wlr
# inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-hyprland
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
# pkgs.xdg-desktop-portal-hyprland
pkgs.xwaylandvideobridge
];
};

View file

@ -1,12 +1,11 @@
age-encryption.org/v1
-> ssh-ed25519 lGzg3g FVQnAikr+NaEefEyOScUsaFIw5heGx2OpDJT9zoMLzE
5GbKVbhQBgzXdDfC8Rsb6afEhtprihJTYJRcSW8SFqo
-> ssh-ed25519 s+NXzQ nWOuWfk7A3q5gJZp1wQS6T2j/HwdDIU5uUanDrVlaQ8
i3a7uJzAEsFTVY1dzDpHc7nUyxFQZ/O6lhSDIVeOzhc
-> ssh-ed25519 yEtzbQ ydftAeD0oV322tjYcBJp3SzAbRpRPKnAOvBXdRAvaWQ
TRflZgEove93gzLpp08xCQUImHyud3Peegu+YgFGxuE
-> ssh-ed25519 RMNffg QVaCNJK1vCmfvfFe7mAkcI3TmYe1riPtpujNSU/3f20
VpuNftaOmtm+ApE5fma/nXP+aNE5a4AaANlijIuqjAE
--- ZIanD46xgc5P2bcsh5o+ElZ/RsNa53HSwzV0EG1GGAE
:)<29>'t w¸îN(MZktͺ7¢ï"q³ÿÂ18?SwçÈ2 Mœåg`ŸD>%Ð-ˆCˆÏÒ$¤Ó¶£è³ºDJü‡¤Ûjc-Yç¥Ñ©wM´ûJì6a“Ñ:É0W3×
×ê|¿ÇÞ/
-> ssh-ed25519 lGzg3g WWwFUt2wxcuYS8lD4r43wHxsmez6UQ4teUIimz0Oqjw
icEILT0b7rTJN3RMRm6brAVm1WUUBWulV+SwwsOS5q0
-> ssh-ed25519 s+NXzQ jlzRrZEZ5APO8Y6fyXvUq/KNoCUW471oo0hSI/Blui8
WA+jdgvFTdNQbHsIFRpu8VASg9MLWaDjxpmAQaLfrI4
-> ssh-ed25519 yEtzbQ eLL0Am5BujKOjBtWkGtL7edO1WVqziLA7FXBrAIMgyY
f4svykvN1JWmo81NdIfI0EMncnDvH8JDzXRzDb+uVAk
-> ssh-ed25519 RMNffg 96x27iHsdzIvZ+gSaIuAkWVzH6x4bV4gvUMY/SfqC1s
Zn0C0l1gFWjO1YkSIi3+N1PsMXCz6/cg2fX2mTOSsmI
--- uJzhYGehBlw/XhCf/5gRPAVdzde/rznRMyS/0XRiOAI
K˜»ü—CGø]H6FK¸<@y¾ð²0±²ëÿ¹bêÝÓÞÒXÉ 'ÎLÀã.ø‹è\Á2FZ q²vS<76>.¿÷:ÅHDÒ ¿½ sF…çøù¹ŠÅd—¢è¯ ÄBf~l[^#

View file

@ -29,7 +29,20 @@ in {
lexend
jost
dejavu_fonts
iosevka-bin
(pkgs-unstable.iosevka.override {
set = "Custom";
privateBuildPlan = ''
[buildPlans.IosevkaCustom]
family = "Iosevka"
spacing = "normal"
serifs = "sans"
noCvSs = true
exportGlyphNames = false
[buildPlans.IosevkaCustom.variants]
inherits = "ss10"
'';
})
noto-fonts
noto-fonts-cjk
noto-fonts-emoji

View file

@ -1,11 +1,15 @@
{writeShellScriptBin, ...}:
{
writeShellScriptBin,
pkgs,
...
}:
writeShellScriptBin "rebuild" ''
set -e
pushd ~/nixos/
alejandra . &>/dev/null
${pkgs.alejandra}/bin/alejandra . &>/dev/null
git add .
git pull origin main
echo "[REBUILD]: rebuilding nixos"
nh os switch
${pkgs.nh}/bin/nh os switch
popd
''