flake.lock: Update

Flake lock file updates: • Updated input 'iosevka-custom': 'git+https://git.xenia.me.uk/pixelifytica/iosevka.git?ref=refs/heads/main&rev=c4213be70f7bc4c20aba7321decfd240a679fcd0' (2024-10-18) → 'git+https://git.xenia.me.uk/pixelifytica/iosevka.git?ref=refs/heads/main&rev=49828459e58b6987d2738b74c085cecb963355ab' (2024-10-30) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/32e940c7c420600ef0d1ef396dc63b04ee9cad37?narHash=sha256-BAuPWW%2B9fa1moZTU%2BjFh%2B1cUtmsuF8asgzFwejM4wac%3D' (2024-10-23) → 'github:nixos/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede?narHash=sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE%3D' (2024-11-06)
Split allowUnfreePredicate to where it's actually needed
2024-11-08 06:39:08 +00:00 · 2024-11-08 06:33:25 +00:00
10 changed files with 109 additions and 99 deletions
--- a/flake.lock
+++ b/flake.lock
@ -189,11 +189,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1729232654,
-        "narHash": "sha256-Fa1U9nAX6ELyLOgHwMNIgpFK9u0WXreV97n8ZnCqY0E=",
+        "lastModified": 1730274547,
+        "narHash": "sha256-34sNwbLNuE6l7jsBkBRUMRahoZc63lCsCa+PoZd/8W8=",
        "ref": "refs/heads/main",
-        "rev": "c4213be70f7bc4c20aba7321decfd240a679fcd0",
-        "revCount": 18,
+        "rev": "49828459e58b6987d2738b74c085cecb963355ab",
+        "revCount": 19,
        "type": "git",
        "url": "https://git.xenia.me.uk/pixelifytica/iosevka.git"
      },
@ -220,11 +220,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1729691686,
-        "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
+        "lastModified": 1730883749,
+        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
+        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
        "type": "github"
      },
      "original": {
--- a/system/Ronin.nix
+++ b/system/Ronin.nix
@ -1,8 +1,10 @@
 { pkgs, username, ... }:
 {
-  imports = [ ./laptop.nix ];
+  imports = [
+    ./laptop.nix
+    ./work.nix
+  ];
  home-manager.users.${username} = {
-    imports = [ ./home/work.nix ];
    home.stateVersion = "23.05";
    wayland.windowManager.hyprland.settings.monitor = [
      "eDP-1,preferred,auto,1.25"
--- a/system/Tone.nix
+++ b/system/Tone.nix
@ -1,8 +1,10 @@
 { pkgs, username, ... }:
 {
-  imports = [ ./desktop.nix ];
+  imports = [
+    ./desktop.nix
+    ./work.nix
+  ];
  home-manager.users.${username} = {
-    imports = [ ./home/work.nix ];
    home.stateVersion = "23.05";
    wayland.windowManager.hyprland.settings.monitor = [
      "desc:Dell Inc. DELL P3223QE CCG8YN3,preferred,auto,1.5"
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@ -5,8 +5,10 @@
  ...
 }:
 {
-  imports = [ ./desktop.nix ];
-  environment.sessionVariables.MANGOHUD = 1;
+  imports = [
+    ./desktop.nix
+    ./steam.nix
+  ];
  home-manager.users.${username} = {
    home = {
      stateVersion = "23.05";
@ -17,7 +19,6 @@
        freecad
        openscad
        kicad-small
-        mangohud
        wineWowPackages.waylandFull
        winetricks
        lutris
@ -38,22 +39,6 @@
      "desc:Acer Technologies ED270R TJMEE0043W01,1920x1080@144,0x140,1.0,vrr,2"
      "desc:Microstep MSI G27CQ4 E2,2560x1440@144,1920x0,1.25,vrr,2"
    ];
-    xdg.configFile."MangoHud/MangoHud.conf".text = with config.lib.stylix.scheme; ''
-      preset=1
-      text_color=${base00}
-      gpu_color=${green}
-      cpu_color=${green}
-      vram_color=${magenta}
-      ram_color=${magenta}
-      engine_color=${red}
-      io_color=${magenta}
-      frametime_color=${green}
-      background_color=${base05}
-      media_player_color=${base00}
-      wine_color=${red}
-      battery_color=${orange}
-      network_color=${red}
-    '';
  };
  boot = {
    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
@ -71,23 +56,10 @@
      driSupport = true;
      driSupport32Bit = true;
    };
-    steam-hardware.enable = true;
-  };
-  system.stateVersion = "23.05";
-  programs = {
-    gamemode.enable = true;
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      gamescopeSession.enable = true;
-    };
-    gamescope = {
-      enable = true;
-      capSysNice = true;
-    };
  };
  services.ollama = {
    enable = true;
    acceleration = "rocm";
  };
+  system.stateVersion = "23.05";
 }
--- a/system/default.nix
+++ b/system/default.nix
@ -56,30 +56,6 @@
      max-free = ${toString (1024 * 1024 * 1024)}
    '';
  };
-  nixpkgs = {
-    config.allowUnfreePredicate =
-      pkg:
-      builtins.elem (lib.getName pkg) [
-        "steam"
-        "steam-original"
-        "steam-run"
-        "steamcmd"
-        "nomachine-client"
-      ];
-    overlays = [
-      (final: prev: {
-        inherit (inputs.plasma-manager.packages.${prev.system}) rc2nix;
-        protonmail-bridge-gui = pkgs.symlinkJoin {
-          name = "protonmail-bridge-gui";
-          paths = [ prev.protonmail-bridge-gui ];
-          buildInputs = [ pkgs.makeWrapper ];
-          postBuild = ''
-            wrapProgram $out/bin/protonmail-bridge-gui --set PASSWORD_STORE_DIR /dev/null
-          '';
-        };
-      })
-    ];
-  };
  system.autoUpgrade = {
    enable = true;
    persistent = true;
--- a/system/home/desktop/default.nix
+++ b/system/home/desktop/default.nix
@ -27,6 +27,8 @@
      webcord
      signal-desktop
      whatsapp-for-linux
+      teams-for-linux
+      twinkle
    ];
    file.${config.gtk.gtk2.configLocation}.force = true;
  };
@ -79,6 +81,14 @@
      # Autostart some programs
      "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
      "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+      "teams-for-linux/config.json".text = builtins.toJSON {
+        awayOnSystemIdle = true;
+        closeAppOnCross = false;
+        followSystemTheme = true;
+        notificationMethod = "electron";
+        optInTeamsV2 = true;
+        spellCheckerLanguages = [ "en_GB" ];
+      };
    };
  };
 }
--- a/system/home/work.nix
+++ b/system/home/work.nix
@ -1,30 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [ ./openfortivpn/ukaea.nix ];
-  home.packages = with pkgs; [
-    nomachine-client
-    teams-for-linux
-    twinkle
-  ];
-  programs.git.userEmail = config.accounts.email.accounts.outlook.address;
-  accounts.email.accounts = {
-    proton.primary = lib.mkForce false;
-    outlook.primary = lib.mkForce true;
-  };
-  xdg.configFile = {
-    "autostart/teams-for-linux.desktop".source = "${pkgs.teams-for-linux}/share/applications/teams-for-linux.desktop";
-    "teams-for-linux/config.json".text = builtins.toJSON {
-      awayOnSystemIdle = true;
-      closeAppOnCross = false;
-      followSystemTheme = true;
-      notificationMethod = "electron";
-      optInTeamsV2 = true;
-      spellCheckerLanguages = [ "en_GB" ];
-    };
-  };
-}
--- a/system/services/satisfactory/default.nix
+++ b/system/services/satisfactory/default.nix
@ -1,6 +1,13 @@
-{ ... }:
+{ lib, ... }:
 {
  imports = [ ./module.nix ];
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam-original"
+      "steam-run"
+      "steamcmd"
+    ];
  services.satisfactory-server = {
    enable = true;
    openFirewall = true;
--- a/system/steam.nix
+++ b/system/steam.nix
@ -0,0 +1,51 @@
+{
+  config,
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+{
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-unwrapped"
+      "steam-original"
+      "steam-run"
+    ];
+  environment = {
+    sessionVariables.MANGOHUD = 1;
+    systemPackages = [ pkgs.mangohud ];
+  };
+  hardware.steam-hardware.enable = true;
+  programs = {
+    gamemode.enable = true;
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      gamescopeSession.enable = true;
+    };
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
+  };
+  home-manager.users.${username}.xdg.configFile."MangoHud/MangoHud.conf".text =
+    with config.lib.stylix.scheme; ''
+      preset=1
+      text_color=${base00}
+      gpu_color=${green}
+      cpu_color=${green}
+      vram_color=${magenta}
+      ram_color=${magenta}
+      engine_color=${red}
+      io_color=${magenta}
+      frametime_color=${green}
+      background_color=${base05}
+      media_player_color=${base00}
+      wine_color=${red}
+      battery_color=${orange}
+      network_color=${red}
+    '';
+}
--- a/system/work.nix
+++ b/system/work.nix
@ -0,0 +1,20 @@
+{
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+{
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomachine-client" ];
+  environment.systemPackages = [ pkgs.nomachine-client ];
+  home-manager.users.${username} =
+    { config, ... }:
+    {
+      imports = [ ./home/openfortivpn/ukaea.nix ];
+      programs.git.userEmail = config.accounts.email.accounts.outlook.address;
+      accounts.email.accounts = {
+        proton.primary = lib.mkForce false;
+        outlook.primary = lib.mkForce true;
+      };
+    };
+}