lix + overlays

base.nix

@@ -55,6 +55,7 @@
         "https://devenv.cachix.org"
         "https://cuda-maintainers.cachix.org"
         "https://ai.cachix.org"
+        "https://cache.lix.systems"
       ];
       trusted-public-keys = [
         "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
@@ -62,6 +63,7 @@
         "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
         "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
         "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
+        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
       ];
     };
   };

dotfiles/gallery-dl/config.json

@@ -2,7 +2,7 @@
   "extractor": {
     "skip": "abort:5",
     "cookies": ["firefox", "yw8fhvh4.default-release", "gnomekeyring"],
-    "user-agent": "O4kc9tTzGItuuacDcfmevW6NELjm5CJdWiAbZdUv3Kk",
+    "user-agent": "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0",
     "retries": 10,
     "sleep-request": 0,
     "directlink": {

flake.lock

@@ -1,5 +1,38 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +54,48 @@
         "type": "github"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1714955862,
+        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
+        "ref": "refs/tags/2.90-beta.1",
+        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
+        "revCount": 15501,
+        "type": "git",
+        "url": "https://git@git.lix.systems/lix-project/lix"
+      },
+      "original": {
+        "ref": "refs/tags/2.90-beta.1",
+        "type": "git",
+        "url": "https://git@git.lix.systems/lix-project/lix"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": [
+          "lix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715278311,
+        "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=",
+        "ref": "refs/heads/main",
+        "rev": "c8ab1e79ba0140bc75731c75177242089506260b",
+        "revCount": 75,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1714272655,
@@ -56,9 +131,26 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "lix": "lix",
+        "lix-module": "lix-module",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,6 +2,16 @@
   description = "A very basic flake";
 
   inputs = {
+    # lix = {
+    #   url =
+    #     "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+    #   flake = false;
+    # };
+    # lix-module = {
+    #   url = "git+https://git.lix.systems/lix-project/nixos-module";
+    #   inputs.lix.follows = "lix";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     home-manager.url = "github:nix-community/home-manager/release-23.11";
@@ -27,12 +37,14 @@
         workstation = lib.nixosSystem {
           inherit system;
           modules = [
+            # lix-module.nixosModules.default
             ./hosts/workstation/configuration.nix
             ({ pkgs, ... }: {
               nixpkgs.overlays = [
                 (self: super: {
                   planify = pkgsU.planify;
                   gdtoolkit = pkgsU.gdtoolkit;
+                  gallery-dl = pkgsU.gallery-dl;
                   lutris = super.lutris.override {
                     extraPkgs = pkgs: [
                       pkgs.winetricks
@@ -45,6 +57,8 @@
                   };
                   handbrake = super.handbrake.override { useGtk = true; };
                   discord = super.discord.override { withOpenASAR = true; };
+                  ripgrep = super.ripgrep.override { withPCRE2 = true; };
+                  blender = super.blender.override { cudaSupport = true; };
                 })
               ];
             })

hosts/workstation/configuration.nix

@@ -109,7 +109,7 @@ in {
           pika-backup # backups
           gnome-obfuscate # censor private information
 
-          (ripgrep.override { withPCRE2 = true; }) # modern grep
+          ripgrep # modern grep
           du-dust # rusty du similar to gdu
           eza # like ls but with colors
           fd # modern find, faster searches

hosts/workstation/hardware-configuration.nix

@@ -38,7 +38,7 @@
         extraEntries = ''
           menuentry "Fedora" {
             set root=(hd1,1)
-            chainloader /EFI/fedora/grubx64.efi
+            chainloader /EFI/fedora/grub.efi
           }
         '';
       };
@@ -83,6 +83,7 @@
     "/mnt/games" = btrfsMount "games" // { };
     # "/mnt/pool" = nfsMount "pool" // { };
     # "/mnt/jawz" = nfsMount "jawz" // { };
+    # "/mnt/btrfs" = nfsMount "btrfs" // { };
     "/boot" = {
       device = "/dev/disk/by-uuid/ac6d349a-96b9-499e-9009-229efd7743a5";
       fsType = "ext4";

modules/apps/gaming.nix

@@ -5,11 +5,13 @@
       gamemode.enable = true;
       steam = {
         enable = true;
+        gamescopeSession.enable = true;
         remotePlay.openFirewall = true;
         dedicatedServer.openFirewall = true;
       };
     };
     users.users.jawz.packages = with pkgs; [
+      mangohud # fps & stats overlay
       lutris # games launcher & emulator hub
       cartridges # games launcher
       gamemode # optimizes linux to have better gaming performance

modules/emacs.nix

@@ -3,7 +3,7 @@
   config = lib.mkIf config.my.emacs.enable {
     users.users.jawz.packages = with pkgs; ([
       fd # modern find, faster searches
-      (ripgrep.override { withPCRE2 = true; }) # modern grep
+      ripgrep # modern grep
     ]);
     services.emacs = {
       enable = true;