summary refs log tree commit diff
path: root/host/Rory-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'host/Rory-desktop')
-rw-r--r--host/Rory-desktop/configuration.nix113
-rw-r--r--host/Rory-desktop/mariadb.nix8
-rw-r--r--host/Rory-desktop/nginx.nix21
-rwxr-xr-xhost/Rory-desktop/nginx/discord.localhost.nix1
-rwxr-xr-xhost/Rory-desktop/ollama.nix9
-rw-r--r--host/Rory-desktop/optional/gui/wayland.nix22
-rw-r--r--host/Rory-desktop/optional/gui/x11.nix13
-rw-r--r--host/Rory-desktop/optional/hardware-specific/amd.nix23
-rw-r--r--host/Rory-desktop/optional/hardware-specific/nvidia.nix20
-rwxr-xr-xhost/Rory-desktop/postgres.nix8
-rw-r--r--host/Rory-desktop/printing.nix18
11 files changed, 149 insertions, 107 deletions
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 756a894..73b361f 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -1,26 +1,32 @@
-args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
+args@{
+  config,
+  pkgs,
+  lib,
+  nhekoSrc,
+  mtxclientSrc,
+  ...
+}:
 
 {
-  imports =
-    [
-      # base imports
-      ../../modules/base-client.nix
-      # (import ../../modules/base-secrets.nix {  path = "/home/rory/.config/sops/config.yaml"; })
-      ../../modules/packages/vim.nix
-#      ../../modules/environments/home.nix
-      ../../modules/software-templates/profilers.nix
-      ./postgres.nix
-      ./nginx.nix
-
-      # hardware-specific imports
-      ./optional/hardware-specific/amd.nix
-
-      ./optional/gui/x11.nix
-      ./optional/gui/wayland.nix
-
-      #./printing.nix
-      ./ollama.nix
-    ];
+  imports = [
+    # base imports
+    ../../modules/base-client.nix
+    # (import ../../modules/base-secrets.nix {  path = "/home/rory/.config/sops/config.yaml"; })
+    ../../modules/packages/vim.nix
+    #      ../../modules/environments/home.nix
+    ../../modules/software-templates/profilers.nix
+    ./postgres.nix
+    ./nginx.nix
+
+    # hardware-specific imports
+    ./optional/hardware-specific/amd.nix
+
+    ./optional/gui/x11.nix
+    ./optional/gui/wayland.nix
+
+    #./printing.nix
+    ./ollama.nix
+  ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
@@ -63,10 +69,12 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
       # allowedUDPPorts = [ ... ];
     };
 
-    interfaces.enp34s0.ipv4.addresses = [ { 
-      address = "192.168.0.3";
-      prefixLength = 24;
-    } ];
+    interfaces.enp34s0.ipv4.addresses = [
+      {
+        address = "192.168.0.3";
+        prefixLength = 24;
+      }
+    ];
 
     defaultGateway = "192.168.0.1";
     # useDHCP = true;
@@ -85,14 +93,14 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
       wacom.enable = true;
     };
     libinput.enable = true;
-    
+
     openssh = {
       enable = true;
       extraConfig = ''
         MaxAuthTries 32
-        '';
+      '';
       settings.PermitRootLogin = "yes";
-    };	
+    };
     pipewire = {
       enable = true;
       audio.enable = true;
@@ -121,15 +129,14 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
     #jetbrains.webstorm
     #jetbrains.clion
     github-copilot-intellij-agent
-    
-    
+
     dbeaver-bin
     #insomnia
     vscode
 
     # - Utilities
     inkscape-with-extensions
-    gimp #-with-plugins
+    gimp # -with-plugins
 
     # - Languages
     #dotnet-sdk_7
@@ -159,7 +166,11 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
     unrar-wrapper
 
     #(schildichat-desktop.override { electron = electron; })
-    (callPackage ../../modules/packages/nheko-git.nix { inherit nhekoSrc; inherit mtxclientSrc; voipSupport = false; })
+    (callPackage ../../modules/packages/nheko-git.nix {
+      inherit nhekoSrc;
+      inherit mtxclientSrc;
+      voipSupport = false;
+    })
     #(callPackage ../../modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
 
     #vesktop
@@ -178,7 +189,7 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
   #];
   xdg = {
     portal = {
-      
+
       enable = true;
       extraPortals = with pkgs; [
         #xdg-desktop-portal-gtk
@@ -205,33 +216,26 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
       (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
       noto-fonts-monochrome-emoji
     ];
-    fontconfig.defaultFonts.monospace = with pkgs; [
-      "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular"
-    ];
-    fontconfig.defaultFonts.sansSerif = with pkgs; [
-      "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular"
-    ];
-    fontconfig.defaultFonts.serif = with pkgs; [
-      "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular"
-    ];
-    fontconfig.defaultFonts.emoji = with pkgs; [
-      "freefont"
-    ];
+    fontconfig.defaultFonts.monospace = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+    fontconfig.defaultFonts.sansSerif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+    fontconfig.defaultFonts.serif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+    fontconfig.defaultFonts.emoji = with pkgs; [ "freefont" ];
     enableDefaultPackages = lib.mkForce false;
     enableGhostscriptFonts = lib.mkForce false;
   };
   nix = {
     settings = {
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
       auto-optimise-store = true;
     };
   };
   nixpkgs = {
     config = {
       allowUnfree = true;
-      permittedInsecurePackages = [
-        "electron-25.9.0"
-      ];
+      permittedInsecurePackages = [ "electron-25.9.0" ];
     };
 
   };
@@ -249,17 +253,16 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
     nameserver 8.4.4.8
     nameserver 1.1.1.1
     nameserver 1.0.0.1
-    '';
+  '';
 
-    #networking.wireguard.interfaces = {
-    #  wg-KP-Ran = {
+  #networking.wireguard.interfaces = {
+  #  wg-KP-Ran = {
 
-      #};
-   # };
+  #};
+  # };
 
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
-
diff --git a/host/Rory-desktop/mariadb.nix b/host/Rory-desktop/mariadb.nix
index 3ebbb0b..758cb3d 100644
--- a/host/Rory-desktop/mariadb.nix
+++ b/host/Rory-desktop/mariadb.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   services.mysql = {
@@ -7,4 +12,3 @@
   };
 
 }
-
diff --git a/host/Rory-desktop/nginx.nix b/host/Rory-desktop/nginx.nix
index fc2adca..31ec0ea 100644
--- a/host/Rory-desktop/nginx.nix
+++ b/host/Rory-desktop/nginx.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   services = {
@@ -14,26 +19,24 @@
       #defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
       appendConfig = ''
         worker_processes 16;
-        '';
-       eventsConfig = ''
+      '';
+      eventsConfig = ''
         #use kqueue;
         worker_connections 512;
-        '';
+      '';
       appendHttpConfig = ''
         #sendfile on;
         disable_symlinks off;
       '';
-      additionalModules = with pkgs.nginxModules; [
-        moreheaders
-      ];
+      additionalModules = with pkgs.nginxModules; [ moreheaders ];
       virtualHosts = {
         "discord.localhost" = import ./nginx/discord.localhost.nix { inherit pkgs; };
-        
+
       };
     };
   };
   systemd.services.nginx.serviceConfig = {
-    LimitNOFILE=5000000;
+    LimitNOFILE = 5000000;
   };
 
 }
diff --git a/host/Rory-desktop/nginx/discord.localhost.nix b/host/Rory-desktop/nginx/discord.localhost.nix
index 149d2b1..b40e13c 100755
--- a/host/Rory-desktop/nginx/discord.localhost.nix
+++ b/host/Rory-desktop/nginx/discord.localhost.nix
@@ -8,7 +8,6 @@
   # We don't care about certificates around here...
   sslCertificate = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.cert.pem";
   sslCertificateKey = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.key.pem";
-        
 
   extraConfig = ''
     autoindex on;
diff --git a/host/Rory-desktop/ollama.nix b/host/Rory-desktop/ollama.nix
index a302d1c..bae196e 100755
--- a/host/Rory-desktop/ollama.nix
+++ b/host/Rory-desktop/ollama.nix
@@ -1,7 +1,12 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
-#  systemd.tmpfiles.rules = [  "d /data/ollama 0750 ostgres postgres" ];
+  #  systemd.tmpfiles.rules = [  "d /data/ollama 0750 ostgres postgres" ];
 
   #overlays
   #nixpkgs.overlays = [
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/wayland.nix
index 74cb192..fd0cd90 100644
--- a/host/Rory-desktop/optional/gui/wayland.nix
+++ b/host/Rory-desktop/optional/gui/wayland.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   programs.sway = {
@@ -16,15 +21,15 @@
       # use this if they aren't displayed properly:
       export _JAVA_AWT_WM_NONREPARENTING=1
       cp ${../../../../modules/users/Rory/wallpaper.webp} ~/.cache/wallpaper.webp
-      
+
     '';
     #(
-        #sleep 5
-        #${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp}
-        #$ {pkgs.swayidle}/bin/swayidle -w timeout 300 'swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}' 'swaymsg "output * dpms off"'
-        #$ {pkgs.swaylock}/bin/swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}
-        #${pkgs.waybar}/bin/waybar
-      #) &
+    #sleep 5
+    #${pkgs.swaybg}/bin/swaybg -i ${../../../../modules/users/Rory/wallpaper.webp}
+    #$ {pkgs.swayidle}/bin/swayidle -w timeout 300 'swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}' 'swaymsg "output * dpms off"'
+    #$ {pkgs.swaylock}/bin/swaylock -f -i ${../../../../modules/users/Rory/wallpaper.webp}
+    #${pkgs.waybar}/bin/waybar
+    #) &
 
     extraPackages = with pkgs; [
       swaybg
@@ -40,4 +45,3 @@
   };
 
 }
-
diff --git a/host/Rory-desktop/optional/gui/x11.nix b/host/Rory-desktop/optional/gui/x11.nix
index 0f55862..9070298 100644
--- a/host/Rory-desktop/optional/gui/x11.nix
+++ b/host/Rory-desktop/optional/gui/x11.nix
@@ -1,8 +1,14 @@
-{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nhekoSrc,
+  mtxclientSrc,
+  ...
+}:
 
 {
-  imports =
-    [ ];
+  imports = [ ];
 
   services = {
     xserver = {
@@ -28,4 +34,3 @@
   };
 
 }
-
diff --git a/host/Rory-desktop/optional/hardware-specific/amd.nix b/host/Rory-desktop/optional/hardware-specific/amd.nix
index 45bea66..3ae47d2 100644
--- a/host/Rory-desktop/optional/hardware-specific/amd.nix
+++ b/host/Rory-desktop/optional/hardware-specific/amd.nix
@@ -1,10 +1,16 @@
-{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nhekoSrc,
+  mtxclientSrc,
+  ...
+}:
 
 {
-  imports =
-    [ ];
+  imports = [ ];
 
-boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
 
   services = {
     xserver = {
@@ -28,16 +34,11 @@ boot.initrd.kernelModules = [ "amdgpu" ];
         rocmPackages.clr.icd
         amdvlk
       ];
-      extraPackages32 = with pkgs; [
-        driversi686Linux.amdvlk
-      ];
+      extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
     };
   };
 
-  systemd.tmpfiles.rules = [
-    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
-  ];
+  systemd.tmpfiles.rules = [ "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}" ];
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
-
diff --git a/host/Rory-desktop/optional/hardware-specific/nvidia.nix b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
index 66b328f..c146c3a 100644
--- a/host/Rory-desktop/optional/hardware-specific/nvidia.nix
+++ b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
@@ -1,17 +1,22 @@
-{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nhekoSrc,
+  mtxclientSrc,
+  ...
+}:
 
 {
-  imports =
-    [
-     
-    ];
+  imports = [
 
+  ];
 
   services = {
     xserver = {
-      videoDrivers = ["nvidia"];
+      videoDrivers = [ "nvidia" ];
       #windowManager.i3.extraSessionCommands = ''
-        # todo: restore
+      # todo: restore
       #'';
     };
     picom.backend = "glx";
@@ -37,4 +42,3 @@
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
-
diff --git a/host/Rory-desktop/postgres.nix b/host/Rory-desktop/postgres.nix
index e1e4432..60fd8d6 100755
--- a/host/Rory-desktop/postgres.nix
+++ b/host/Rory-desktop/postgres.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   #systemd.tmpfiles.rules = [  "d /mnt/postgres/data 0750 postgres postgres" ];
@@ -31,4 +36,3 @@
   };
 
 }
-
diff --git a/host/Rory-desktop/printing.nix b/host/Rory-desktop/printing.nix
index fd33aaa..2480610 100644
--- a/host/Rory-desktop/printing.nix
+++ b/host/Rory-desktop/printing.nix
@@ -1,11 +1,19 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   imports = [ ];
 
   users.users = {
     Rory = {
-      extraGroups = [ "lp" "scanner" ];
+      extraGroups = [
+        "lp"
+        "scanner"
+      ];
     };
   };
 
@@ -16,7 +24,10 @@
 
   hardware = {
     sane.enable = true;
-    sane.extraBackends = [ pkgs.hplipWithPlugin pkgs.sane-airscan ];
+    sane.extraBackends = [
+      pkgs.hplipWithPlugin
+      pkgs.sane-airscan
+    ];
   };
 
   programs.system-config-printer.enable = true;
@@ -48,4 +59,3 @@
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
-
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-19 16:11:38 +0000