From c4b0a468e390bd3ae1b47ca67c390056029ba09a Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Sat, 3 Jan 2026 20:18:31 -0700 Subject: [PATCH] server updates --- flake.lock | 176 +++++++++++++++++++++++++++++++++++------------- flake.nix | 16 +++-- hosts/magus.nix | 4 +- 3 files changed, 145 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index d2ec86d..e3a5071 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1767024902, + "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1767411397, - "narHash": "sha256-L+ua2DR5q1a3aT0TG9n3mCfSpa/WUkxamZOcteGq9+Y=", + "lastModified": 1767483096, + "narHash": "sha256-oj/4uIs+ktiO5WCx1SWviw6evpABkSOb+v2TjuKhKZ0=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "e1817027b1aafee74fd7d38ef109c932cb6758de", + "rev": "913bb2ff67fbc4576f17220b5f266217bf33825b", "type": "github" }, "original": { @@ -132,19 +132,33 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } }, + "flake-compat_4": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -163,6 +177,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -351,11 +383,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1766946335, + "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "4af02a3925b454deb1c36603843da528b67ded6c", "type": "github" }, "original": { @@ -381,11 +413,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767381047, - "narHash": "sha256-mQTek8IQ9uxaRxEI16iRtKkJ+RVq1QWHpleS5ICy+lc=", + "lastModified": 1767474766, + "narHash": "sha256-Vkl6ta0Jaim6MvbNKfhb5GR/FtW3NyMRXyioBH1rcC0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ee67278038b5b6597172b2a3ee9d57f6ad0eafc7", + "rev": "583c4074a5d4229f841d9e470ab427339773b592", "type": "github" }, "original": { @@ -443,11 +475,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -574,11 +606,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -628,11 +660,11 @@ ] }, "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "lastModified": 1767473322, + "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "type": "github" }, "original": { @@ -698,6 +730,26 @@ "type": "github" } }, + "nixcord": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1767451989, + "narHash": "sha256-sUZmTUFti+uETSvUEQ3bklw8fFoDPKD9E4dbgxvRKPc=", + "owner": "FlameFlag", + "repo": "nixcord", + "rev": "93b998d75b3548314fc196e65186f307c4807e94", + "type": "github" + }, + "original": { + "owner": "FlameFlag", + "repo": "nixcord", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1744536153, @@ -729,6 +781,37 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1766747458, + "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1763191728, @@ -776,11 +859,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -824,11 +907,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1767325753, - "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", + "lastModified": 1766885793, + "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", + "rev": "9ef261221d1e72399f2036786498d78c38185c46", "type": "github" }, "original": { @@ -840,16 +923,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1766747458, - "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=", - "owner": "nixos", + "lastModified": 1767325753, + "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce", + "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -900,11 +983,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -915,7 +998,7 @@ }, "proton-cachyos": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1766810311, @@ -987,7 +1070,8 @@ "linux-desktop-gremlin": "linux-desktop-gremlin", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_8", + "nixcord": "nixcord", + "nixpkgs": "nixpkgs_9", "nvim-dots": "nvim-dots", "pinix": "pinix", "proton-cachyos": "proton-cachyos", @@ -1060,11 +1144,11 @@ }, "unstable": { "locked": { - "lastModified": 1767273430, - "narHash": "sha256-kDpoFwQ8GLrPiS3KL+sAwreXrph2KhdXuJzo5+vSLoo=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76eec3925eb9bbe193934987d3285473dbcfad50", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 99df70b..99f2d0d 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,10 @@ url = "github:iluvgirlswithglasses/linux-desktop-gremlin"; }; + nixcord = { + url = "github:FlameFlag/nixcord"; + }; + disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -120,9 +124,9 @@ minijinja-cli thorium rpcs3 + clear-sans + binary-font ; - clear-sans = customPkgs.clear-sans.clear-sans; - binary-font = customPkgs.binary-font.binary-clock-font; }; nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { specialArgs = { @@ -145,8 +149,7 @@ ghostty = inputs.ghostty.packages.${system}.default; hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default; grim-hyprland = inputs.grim-hyprland.packages.${system}.default; - dmsCli = inputs.dankMaterialShell.packages.${system}.default; - dankMaterialShell = inputs.dankMaterialShell.packages.${system}.dankMaterialShell; + dms-shell = inputs.dankMaterialShell.packages.${system}.default; pinix = inputs.pinix.packages.${system}.default; wine-cachyos = inputs.nix-gaming.packages.${system}.wine-cachyos; proton-cachyos = inputs.proton-cachyos.packages.${system}.proton-cachyos; @@ -185,12 +188,16 @@ nvimDots = inputs.nvim-dots; dankMaterialShell = inputs.dankMaterialShell.packages.${system}.default; }; + sharedModules = [ + inputs.nixcord.homeModules.nixcord + ]; users.cobray = import ./home-manager/cobray.nix; }; } ]; }; + # server nixosConfigurations.magus = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; @@ -215,6 +222,7 @@ (final: prev: { clear-sans = prev.clear-sans.clear-sans; binary-font = prev.binary-font.binary-clock-font; + pinix = inputs.pinix.packages.${system}.default; }) ]; }; diff --git a/hosts/magus.nix b/hosts/magus.nix index 9313b83..0ce061a 100644 --- a/hosts/magus.nix +++ b/hosts/magus.nix @@ -23,6 +23,7 @@ ./modules/python.nix ./modules/go.nix ./modules/ld.nix + ./modules/core.nix ]; system.stateVersion = "25.11"; @@ -33,8 +34,9 @@ programs.fish.enable = true; + npm.enable = true; + environment.systemPackages = with pkgs; [ - busybox xclip direnv ];