diff --git a/flake.lock b/flake.lock index 7dc918c..9984cc7 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -186,16 +186,33 @@ "type": "github" } }, + "dzgui": { + "flake": false, + "locked": { + "lastModified": 1702780245, + "narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=", + "owner": "aclist", + "repo": "dztui", + "rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1", + "type": "github" + }, + "original": { + "owner": "aclist", + "repo": "dztui", + "type": "github" + } + }, "dzgui-nix": { "inputs": { + "dzgui": "dzgui", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1715128199, - "narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=", + "lastModified": 1702850463, + "narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "03968bade43d23c47e8b4f102c711c171c446645", + "rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d", "type": "github" }, "original": { @@ -375,7 +392,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -393,7 +410,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -411,7 +428,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1694529238, @@ -429,7 +446,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -447,14 +464,14 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -491,11 +508,11 @@ ] }, "locked": { - "lastModified": 1715359697, - "narHash": "sha256-FJYyXqulIbCdsUCTFBTu/bIH4aN+7jzjQAn52Qc6qPg=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2c5ba5e720fd584d83f2f97399dac0d26ae60b9", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -506,10 +523,7 @@ }, "hyprcursor": { "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -520,11 +534,11 @@ ] }, "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", + "lastModified": 1710257359, + "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", + "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", "type": "github" }, "original": { @@ -536,20 +550,21 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", + "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1715342341, - "narHash": "sha256-jHCjAwaukNCI7yVsbB8oppl1dUujvFAfRiXaecqWGI0=", + "lastModified": 1710538160, + "narHash": "sha256-p5Wkl2rXjFftd+Nugiq71BgGAl4E9byYxKV0ahLTo+U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "38911d6df4977b6b00557cc887eb151d032e505b", + "rev": "2a2da6082e5f1501731004b755d35a8dbb605fde", "type": "github" }, "original": { @@ -562,12 +577,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" ], "systems": [ "hyprland", - "xdph", "systems" ] }, @@ -589,19 +602,17 @@ "inputs": { "nixpkgs": [ "hyprland", + "hyprcursor", "nixpkgs" ], - "systems": [ - "hyprland", - "systems" - ] + "systems": "systems_4" }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -610,7 +621,7 @@ "type": "github" } }, - "hyprwayland-scanner": { + "hyprlang_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -622,16 +633,16 @@ ] }, "locked": { - "lastModified": 1715287423, - "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "repo": "hyprlang", "type": "github" } }, @@ -697,11 +708,11 @@ ] }, "locked": { - "lastModified": 1714878592, - "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -712,16 +723,15 @@ }, "nix-software-center": { "inputs": { - "nixos-appstream-data": "nixos-appstream-data", "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { - "lastModified": 1714856183, - "narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=", + "lastModified": 1703105285, + "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", "owner": "vlinkz", "repo": "nix-software-center", - "rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386", + "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", "type": "github" }, "original": { @@ -730,32 +740,6 @@ "type": "github" } }, - "nixos-appstream-data": { - "inputs": { - "flake-utils": [ - "nix-software-center", - "utils" - ], - "nixpkgs": [ - "nix-software-center", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712858390, - "narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=", - "owner": "korfuri", - "repo": "nixos-appstream-data", - "rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a", - "type": "github" - }, - "original": { - "owner": "korfuri", - "ref": "flake", - "repo": "nixos-appstream-data", - "type": "github" - } - }, "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_3", @@ -804,11 +788,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714562304, - "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -881,11 +865,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -913,11 +897,11 @@ "ranger-icons": { "flake": false, "locked": { - "lastModified": 1713564482, - "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=", + "lastModified": 1709209315, + "narHash": "sha256-ETE13REDIVuoFIbvWqWvQLj/2fGST+1koowmmuBzGmo=", "owner": "alexanderjeurissen", "repo": "ranger_devicons", - "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861", + "rev": "ed718dd6a6d5d2c0f53cba8474c5ad96185057e9", "type": "github" }, "original": { @@ -1072,6 +1056,21 @@ "type": "github" } }, + "systems_11": { + "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": 1681028828, @@ -1119,16 +1118,16 @@ }, "systems_5": { "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" } }, @@ -1215,7 +1214,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -1254,11 +1253,11 @@ ] }, "locked": { - "lastModified": 1715216838, - "narHash": "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=", + "lastModified": 1685576039, + "narHash": "sha256-WMkWurJsZZG7YkWzW/k2SNquYLsAZjzFs7CFswSjDew=", "owner": "lelgenio", "repo": "wl-crosshair", - "rev": "39b716cf410a1b45006f50f32f8d63de5c43aedb", + "rev": "57d0908e10d9f58fc37fe866404cc8b66be1f0d9", "type": "github" }, "original": { @@ -1267,9 +1266,31 @@ "type": "github" } }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", + "type": "gitlab" + } + }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -1284,11 +1305,11 @@ ] }, "locked": { - "lastModified": 1714662532, - "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1f228ba2f1f254195c0b571302b37482861abee3", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/hosts/monolith.nix b/hosts/monolith.nix index c5dcece..0ab6229 100644 --- a/hosts/monolith.nix +++ b/hosts/monolith.nix @@ -46,14 +46,7 @@ in rocmPackages.rocm-smi ]; - programs.corectrl = { - enable = true; - gpuOverclock = { - enable = true; - ppfeaturemask = "0xffffffff"; - }; - }; - + programs.corectrl.enable = true; virtualisation.virtualbox.host.enable = true; fileSystems."/" = { diff --git a/overlays/default.nix b/overlays/default.nix index c5d145d..b34ed17 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -35,6 +35,10 @@ tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; + + webcord = (prev.webcord.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ]; + })); }); patches = (final: prev: { diff --git a/patches/webcord/fix-reading-config.patch b/patches/webcord/fix-reading-config.patch new file mode 100644 index 0000000..92e89ca --- /dev/null +++ b/patches/webcord/fix-reading-config.patch @@ -0,0 +1,14 @@ +diff --git a/sources/code/main/modules/config.ts b/sources/code/main/modules/config.ts +index caf51df..41faabe 100644 +--- a/sources/code/main/modules/config.ts ++++ b/sources/code/main/modules/config.ts +@@ -158,6 +158,9 @@ class Config { + #read(): unknown { + const encodedData = readFileSync(this.#path+this.#pathExtension); + let decodedData = encodedData.toString(); ++ if (decodedData === "") ++ return {}; ++ + if(this.#pathExtension === FileExt.Encrypted) + decodedData = safeStorage.decryptString(encodedData); + return JSON.parse(decodedData); diff --git a/system/configuration.nix b/system/configuration.nix index 7c6bbb3..93d828c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -99,7 +99,7 @@ }; # Enable touchpad support (enabled default in most desktopManager). - services.libinput.enable = true; + services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.mutableUsers = false; diff --git a/user/firefox.nix b/user/firefox.nix index b60f808..9c29b25 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -28,12 +28,6 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi"; hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0="; }) - (pkgs.fetchFirefoxAddon { - name = "i-still-dont-care-about-cookies"; - url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; - hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; - }) - (pkgs.fetchFirefoxAddon { name = "vimium_ff"; url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; @@ -49,11 +43,6 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi"; hash = "sha256-4iU25chpjsdsMTPaa0yQOTWc9V9q1qFz6YV0lYtNjLA="; }) - (pkgs.fetchFirefoxAddon { - name = "substitoot"; - url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; - hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; - }) # Locale (pkgs.fetchFirefoxAddon { diff --git a/user/ssh.nix b/user/ssh.nix index 8230dc1..a29dded 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -6,12 +6,12 @@ in { programs.ssh.matchBlocks = { monolith = { user = "lelgenio"; - hostname = "monolith.lelgenio.com"; + hostname = "lelgenio.1337.cx"; port = 9022; }; phantom = { user = "root"; - hostname = "phantom.lelgenio.com"; + hostname = "phantom.lelgenio.xyz"; port = 9022; }; }; diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index 22d9550..edc2e3f 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -5,35 +5,29 @@ let in { services.kanshi = { - settings = [ - { - profile = { - name = "sedetary"; - outputs = [ - { - criteria = "eDP-1"; - status = "disable"; - position = "1920,312"; - } - { - criteria = "HDMI-A-1"; - position = "0,0"; - } - ]; - exec = [ "xrdb .Xresources" ]; - }; - } - { - profile = { - name = "nomad"; - outputs = [{ + profiles = { + sedetary = { + outputs = [ + { criteria = "eDP-1"; - status = "enable"; + status = "disable"; position = "1920,312"; - }]; - exec = [ "xrdb .Xresources" ]; - }; - } - ]; + } + { + criteria = "HDMI-A-1"; + position = "0,0"; + } + ]; + exec = [ "xrdb .Xresources" ]; + }; + nomad = { + outputs = [{ + criteria = "eDP-1"; + status = "enable"; + position = "1920,312"; + }]; + exec = [ "xrdb .Xresources" ]; + }; + }; }; } diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 1ec8cf5..3731222 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -59,7 +59,6 @@ in { app_id = "wdisplays"; } { app_id = "pavucontrol"; } { app_id = ".*[Hh]elvum.*"; } - { workspace = "9"; } ]; }; }; diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix index f9f06eb..dfd99bc 100644 --- a/user/sway/swaylock.nix +++ b/user/sway/swaylock.nix @@ -5,7 +5,7 @@ let in { programs.swaylock.settings = { - image = toString theme.background; + image = theme.background; font = font.interface; font-size = font.size.medium; indicator-thickness = 20; diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 2fc1fc1..414a588 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -35,7 +35,7 @@ lib.mkIf (desktop == "sway") ); qt = { enable = true; - platformTheme.name = "qtct"; + platformTheme = "qtct"; }; dconf.settings = { diff --git a/user/variables.nix b/user/variables.nix index 80ac8ba..1103e8b 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -27,7 +27,7 @@ let icon_theme = "Papirus-Dark"; cursor_theme = "Bibata-Modern-Classic"; - background = ./backgrounds/nixos-dark-pattern.png; + background = "~/.local/share/backgrounds/nixos-dark-pattern.png"; opacity = 95; opacityHex = "ee"; color = { @@ -58,7 +58,7 @@ let icon_theme = "Papirus-Light"; cursor_theme = "Bibata-Modern-Classic"; - background = ./backgrounds/nixos-light-pattern.png; + background = "~/.local/share/backgrounds/nixos-light-pattern.png"; opacity = 95; opacityHex = "ee"; color = {