diff --git a/adyya-pkgs/adyya_pkgs.mod.nix b/adyya-pkgs/adyya_pkgs.mod.nix index 693e443..828059d 100644 --- a/adyya-pkgs/adyya_pkgs.mod.nix +++ b/adyya-pkgs/adyya_pkgs.mod.nix @@ -54,13 +54,16 @@ ]; } ) - /* ({ + /* + ({ nixpkgs.overlays = [ (final: prev: { gts = final.callPackage ./gts.nix {}; }) ]; - })*/ # not needed right now. One: gts is now on fructose Two: The latest version of gts is now on nixpkgs + }) + */ + # not needed right now. One: gts is now on fructose Two: The latest version of gts is now on nixpkgs ]; personal.modules = [ { diff --git a/apps.mod.nix b/apps.mod.nix index 1da06e6..d2707a5 100644 --- a/apps.mod.nix +++ b/apps.mod.nix @@ -6,13 +6,15 @@ ps wget libqalculate - # magic-wormhole # disabled because of a build failure, currently writing an issue for it - https://github.com/NixOS/nixpkgs/issues/368842 -j. + # magic-wormhole # disabled because of a build failure, currently writing an issue for it - https://github.com/NixOS/nixpkgs/issues/368842 -j. ]; programs = { # For the love of Fucking please keep them in alphabetical order to soothe my brain - /* btop = { + /* + btop = { enable = true; # disabled because of rocmPackages.llvm.libc build failure, watch https://github.com/NixOS/nixpkgs/issues/368672 . - };*/ + }; + */ emacs = { enable = true; }; diff --git a/dev.mod.nix b/dev.mod.nix index c0bd5a7..0f15578 100644 --- a/dev.mod.nix +++ b/dev.mod.nix @@ -9,7 +9,14 @@ extraConfig = { core = { editor = "emacs"; - sshCommand = "ssh -i ~/.ssh/id_ed25519"; + sshCommand = "ssh -i ~/.ssh/id_ed25519 -i ~/.ssh/github"; #github wants a password protected ssh key, which wouldn't work with my usual workflow -e + }; + url = { + "ssh://git@ssh.github.com:443/" = { + insteadOf = [ + "git@github.com" + ]; + }; }; }; }; diff --git a/flake.lock b/flake.lock index 27072c3..97f2ae9 100644 --- a/flake.lock +++ b/flake.lock @@ -137,6 +137,59 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -161,11 +214,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -182,11 +235,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -202,11 +255,11 @@ ] }, "locked": { - "lastModified": 1735222882, - "narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=", + "lastModified": 1736047960, + "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530", + "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "type": "github" }, "original": { @@ -266,11 +319,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1735286948, - "narHash": "sha256-JMRV2RI58nV1UqLXqm+lcea1/dr92fYjWU5S+Rz3fmE=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31ac92f9628682b294026f0860e14587a09ffb4b", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -282,11 +335,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -314,16 +367,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "lastModified": 1735648875, + "narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -360,11 +413,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1736064798, + "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", "type": "github" }, "original": { @@ -381,20 +434,22 @@ "base16-vim": "base16-vim", "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_4", "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1735253599, - "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=", + "lastModified": 1736179037, + "narHash": "sha256-uhLRE3x5TrFeQm1waBz6ecqa2EHilFM4jLxYbOJPGrU=", "owner": "danth", "repo": "stylix", - "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a", + "rev": "a6b53aa677ab9bd9098abbdc47924854c76c3eb1", "type": "github" }, "original": { @@ -483,6 +538,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/games.mod.nix b/games.mod.nix index 1e501ee..83dd66b 100644 --- a/games.mod.nix +++ b/games.mod.nix @@ -17,8 +17,8 @@ {pkgs, ...}: { home.packages = with pkgs; [ lutris - # bottles # disabled because of python 3.12 patool failing to build - https://github.com/NixOS/nixpkgs/issues/367772 - # heroic # disabled because of electron build failure - https://github.com/NixOS/nixpkgs/issues/368172 + bottles + heroic r2modman ]; programs.mangohud.enable = true; diff --git a/nerd.mod.nix b/nerd.mod.nix index daf139e..96abd40 100644 --- a/nerd.mod.nix +++ b/nerd.mod.nix @@ -8,7 +8,7 @@ chemtool avogadro2 ]; - # programs.sagemath.enable = true; # disabled because of ecm (eliptic curve method for integer factorization) build failure - https://github.com/NixOS/nixpkgs/issues/368655 + programs.sagemath.enable = true; } ) ]; diff --git a/services/forgejo/runner.mod.nix b/services/forgejo/runner.mod.nix index 8eba7b1..e498dea 100644 --- a/services/forgejo/runner.mod.nix +++ b/services/forgejo/runner.mod.nix @@ -9,7 +9,8 @@ }: { services.gitea-actions-runner = { package = pkgs.forgejo-runner; - /* instances = { + /* + instances = { ${config.networking.hostName} = { enable = true; hostPackages = with pkgs; @@ -28,10 +29,13 @@ settings = {}; tokenFile = config.sops.templates."forgejo_runner.env.secrets.yaml".path; url = "https://git.collective-conciousness.monster"; - }; - }; */ - }; + }; + }; + */ + }; } ) ]; -} # this isn't working at all, right now. For some reasom fructose fails to start the containers when podman dns isn't enabled, but if it is, pihole fails to bind to :53, i'll probably have to just change the pihole port and enable podman dns? anyways, besides that, glucose doesn't work *at all* with the runner, it never did, so i really should figure that out at some point. :TODO \ No newline at end of file +} +# this isn't working at all, right now. For some reasom fructose fails to start the containers when podman dns isn't enabled, but if it is, pihole fails to bind to :53, i'll probably have to just change the pihole port and enable podman dns? anyways, besides that, glucose doesn't work *at all* with the runner, it never did, so i really should figure that out at some point. :TODO + diff --git a/sops.mod.nix b/sops.mod.nix index 582a33d..e09422d 100644 --- a/sops.mod.nix +++ b/sops.mod.nix @@ -20,8 +20,10 @@ sops.secrets.remote-build-ssh-privkey = {}; } ]; - /* aspartame.modules = [ - ]; */ + /* + aspartame.modules = [ + ]; + */ sucrose.modules = [ ( {config, ...}: {