Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod

+ refactor

.ignore

@@ -0,0 +1,15 @@
+flake.lock
+*.remmina
+*.pem
+*.env
+*.key
+*.ovpn
+sops-secrets.yaml
+*.png
+*.jpg
+*.webp
+*.gif
+*.mp3
+*.mp4
+
+

.sops.yaml

@@ -1,7 +1,10 @@
 keys:
   - &users:
-    - &nx2backup age1sgzc2jh8af30a3cp6g7l4hyzusqrn3x3xw7frghc4akvjaplwa3stfemxc
     - &nx2 22FB2CC03DC5292AB81CF67D0AF27B383170E634
+    - &nx2_key_13 age1x2lpsennl74n0f5jl60uv2ffjcuqymzf9ap3frlz2quyv0x3hq3scnewwq
+    - &xps-home age1pn4utvwpqdrswn0xurfdexn5nks9cd06jxzwg3m3m6za25ap4vxqxd0p3k
+    - &ace-home age1ur5zpr325cv7w0yn49azz9f48xsxd73w2sytt22yrnw5qs9r34nsv3vl05
+    - &north-home age1jr72q042ccgxpdgdaaev0arzc0vh3r02etv2tzhhsejl0mfaxs3q9hhlaz
   - &hosts:
     - &north age1vkqn2nars5qmpr35tac0x9vshphrq6nnzjfyxwusgn27kt3zualssv0u8e
     - &xps age1jvf2lyrt2dw9jfnwgvnhmj9fmvyq8vvtepqjpkyycc5dqkkd4edqhxsgv6
@@ -13,6 +16,9 @@ creation_rules:
       - *north
       - *xps
       - *ace
-      - *nx2backup
+      - *nx2_key_13
+      - *xps-home
+      - *ace-home
+      - *north-home
       pgp:
       - *nx2

configuration.nix

@@ -1,120 +1,73 @@
-{ pkgs, inputs, ... }:
-{
+{ ... }@all: with all; {
   imports = [
     inputs.sops-nix.nixosModules.sops
+    ./system-modules/adb.nix
     ./system-modules/auto-mount.nix
-    ./system-modules/hardware-configuration.nix
-    ./system-modules/fuse.nix
-    ./system-modules/nvidia.nix 
-    ./system-modules/users.nix
-    ./system-modules/sound.nix
-    ./system-modules/fonts.nix
-    ./system-modules/boot.nix 
-    ./system-modules/gc.nix
+    ./system-modules/tz.nix
+    ./system-modules/bluetooth.nix
     ./system-modules/boot.nix
+    ./system-modules/cache.nix
+    ./system-modules/calendar.nix
     ./system-modules/dm.nix
     ./system-modules/docker.nix
     ./system-modules/fcitx5.nix
     ./system-modules/fonts.nix
     ./system-modules/fuse.nix
+    ./system-modules/games.nix
     ./system-modules/gc.nix
     ./system-modules/gpg.nix
     ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
     ./system-modules/hsmw.nix
     ./system-modules/kanata.nix
+    ./system-modules/terminal.nix
     ./system-modules/kodi.nix
     ./system-modules/networking.nix
+    ./system-modules/nixd.nix
     ./system-modules/nvidia.nix 
-    ./system-modules/nx2site.nix
+    ./system-modules/obs.nix
     ./system-modules/ollama.nix
     ./system-modules/qmk.nix
+    ./system-modules/scanning.nix
     ./system-modules/sops.nix
     ./system-modules/sound.nix
     ./system-modules/sshd.nix
+    ./system-modules/input.nix
     ./system-modules/syncthing.nix
+    ./system-modules/tuda.nix
+    ./system-modules/gui.nix
+    ./system-modules/editor.nix
+    ./system-modules/printing.nix
+    ./system-modules/security.nix
     ./system-modules/users.nix
     ./system-modules/virtualisation.nix
     ./system-modules/ydotool.nix
-  ];
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console.font = "Lat2-Terminus16";
-  console.keyMap = "de";
-
-  services.xserver = {
-    enable = true;
-    xkb = {
-      layout = "de";
-      options = "eurosign:e,caps:escape";
-    };
-    # lightdm in lightdm.nix
-  };
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
-  hardware.uinput.enable = true;
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;  
-    package = pkgs.bluez5-experimental;
-    settings.Policy.AutoEnable = "true";
-    settings.General.Enable = "Source,Sink,Media,Socket";
-   };
-  services.blueman.enable = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; ([
-    git
-    git-crypt
-    lazygit # home-manager module is bugged
-    wget
-    curl
-    zip
-    unzip
-    p7zip
-    unar
-    nano
-    htop
-    direnv
-    openssl
-    blueman
-    dmidecode
-    file
-  # ]) ++ (with pkgs-unstable; [
-  # # sendme
+  ] ++ (if (hyper.host == "NxACE") then [ 
+    ./system-modules/nx2site.nix
+    ./system-modules/hugo.nix
+    ./system-modules/postgres.nix
+    ./system-modules/nx2site/proxy.nix
+    ./system-modules/nx2site/audiobookshelf.nix
+    ./system-modules/nx2site/copyparty.nix
+    ./system-modules/nx2site/gitea.nix
+    ./system-modules/nx2site/open-web-calendar.nix
+    ./system-modules/nx2site/radicale.nix
+    ./system-modules/nx2site/vaultwarden.nix
+    ./system-modules/nx2site/paperless.nix
+    ./system-modules/calendar/publish.nix
+    ./system-modules/calendar/lec.nix
+    ./system-modules/calendar/lr.nix
+    ./system-modules/calendar/dicos.nix
+  ] else [
   ]);
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
 
-  environment.variables = {
-    EDITOR = "hx";
-    VISUAL = "hx";  
-  };
-
-
-  programs.hyprland = {
-    # config is done with home-manager
-    enable = true;
-    xwayland.enable = true;
-  };
-
-  system.stateVersion = "24.05";
-
-  nixpkgs.config.allowUnfree = true;
-
+  systemd.extraConfig = "DefaultLimitNOFILE=2048";
+  system.stateVersion = hyper.pkgs-version;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   programs.bash.shellInit = ''
+    if [[ "$USER" == "${hyper.user}" ]]; then
       source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+    fi
   '';
 }

flake-modules/allowed.nix

@@ -1,9 +1,12 @@
 
 {
   unfree = [
+    "cursor"
     "discord"
     "spotify"
     "obsidian"
+    "steam"
+    "steam-unwrapped"
     "zoom-us"
     "zoom"
 
@@ -35,6 +38,8 @@
     "libnvjitlink"
     "libcusparse"
     "libnpp"
+
+    "vscode-extension-mhutchie-git-graph"
   ];
 
   inecure = [

flake-modules/colors.json

@@ -1,13 +1,13 @@
 {
     "base": {
-        "foreground": "#eedce2",
-        "background": "#221016"
+        "foreground": "#eddbef",
+        "background": "#100711"
     },
     "to_alter": {
-        "accent": "#ac5271",
-        "secondary": "#f20c5b",
-        "tertiary": "#d5a287",
-        "special": "#51ac8d",
-        "weird": "#0cf2a3"
+        "accent": "#ba71c0",
+        "secondary": "#3266ff",
+        "tertiary": "#4bb6e6",
+        "special": "#76c071",
+        "weird": "#c08571"
     }
 }

flake-modules/rice.nix

@@ -3,37 +3,51 @@ pkgs: rec {
   lib = import ../nxlib/ricelib.nix pkgs.lib;
 
   transparency = 0.8;
-  rounding = 10;
-  gap-size = 10;
-  border-width = 3;
-  color =
-    let
-      dark = (-0.5);
-      bright = (0.5);  
-      alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
-      alter     = let f = lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
+  rounding = 3;
+  gap-size = 5;
+  border-width = 2;
+  color = let
+    dark = (-0.4);
+    darker = (-0.6);
+    bright = 0.4;  
+    brighter = 0.7;  
+    alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: {
+      base = color-value;
+      dark = f color-value dark;
+      darker = f color-value darker;
+      bright = f color-value bright;
+      brighter = f color-value brighter;
+    };
+    alter = let f = lib.alter-luminace-hex; in color-value: {
+      base = color-value;
+      dark = f color-value dark;
+      darker = f color-value darker;
+      bright = f color-value bright;
+      brighter = f color-value brighter;
+    };
     # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json));
     ccolor = builtins.mapAttrs alter-set {
-        black =   "#111111"; # "#111111" "#001100";
+      black =   "#040404"; # "#111111" "#001100";
       white =   "#dddddd"; # "#dddddd" "#66dd66";
       blue =    "#4444dd"; # "#3333dd" "#003300";
       cyan =    "#44dddd"; # "#11dddd" "#00dd55";
       green =   "#44dd44"; # "#11dd11" "#11dd11";
       magenta = "#dd44dd"; # "#dd11dd" "#005500";
       red =     "#dd4444"; # "#dd1111" "#00aa00";
-        yellow =  "#dd4444"; # "#dddd11" "#ffff00";
+      yellow =  "#dddd44"; # "#dddd11" "#ffff00";
     };
     facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter;
     fbcolor =                             (builtins.fromJSON (builtins.readFile ./colors.json)).base;
     fcolor = facolor // fbcolor;
-      xcolor = with ccolor; with fcolor; rec {
-        background = "#000000";
+    xcolor = with ccolor; with fcolor; {
+      # background = "#000000";
       # foreground = "#dddddd";
       # accent = blue;
       # secondary = cyan;
       # tertiary = magenta;
       # special = yellow;
       # weird = green;
+      subtle = { darker = "#111111"; dark = "#444444"; base = "#777777"; bright = "#999999"; brighter = "#cccccc"; };
       positive = alter "#00dd00";
       negative = alter "#dd0000";
       border = accent.base;
@@ -41,18 +55,16 @@ pkgs: rec {
     };
   in ccolor // fcolor // xcolor; 
   font = {
-    code = {
-      name = "JetBrainsMono-NF";
-      name2 = "JetBrainsMono Nerd Font";
-      package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
-      # name = "CascadiaCove-NF";
-      # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
+    code = rec {
+      name = "JetBrainsMono Nerd Font";
+      package = pkgs.nerd-fonts.jetbrains-mono;
+      regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf";
     };
     base = {
       # name = "NewComputerModern08";
       # package = pkgs.newcomputermodern;
       name = "Atkinson Hyperlegible";
-      package = pkgs.atkinson-hyperlegible;
+      package = pkgs.atkinson-hyperlegible-next;
     };
   };
   cursor = {

flake.nix

@@ -2,69 +2,140 @@
   description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
 
   inputs = {
-    nixpkgs =          { url = "nixpkgs/nixos-24.05";                                                                        };
-    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                     };
-    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                            };
-    home-manager =     { url = "github:nix-community/home-manager/release-24.05";      inputs.nixpkgs.follows = "nixpkgs";   };
-    sops-nix =         { url = "github:Mic92/sops-nix";                                inputs.nixpkgs.follows = "nixpkgs";   };
-    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.3.0";                                                     };
+    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-latest.url = "github:nixos/nixpkgs?ref=master";
+    nixpkgs24.url = "github:NixOS/nixpkgs/nixos-24.05";
 
-    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                        };
-    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                       inputs.hyprland.follows = "hyprland"; };
-    Hyprspace =        { url = "github:KZDKM/Hyprspace";                               inputs.hyprland.follows = "hyprland"; };
-    hyprswitch =       { url = "github:h3rmt/hyprswitch/release";                                                            };
-
-    # firefox-addons =   { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
-    zen-browser.url = "github:MarceColl/zen-browser-flake";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-25.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    home-manager24 ={
+      url = "github:nix-community/home-manager/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs24";
     };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-latest, home-manager, ... }@inputs: let
+    nix-on-droid = {
+      url = "github:nix-community/nix-on-droid/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs24";
+      inputs.home-manager.follows = "home-manager24";
+    };
+
+    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
+
+    sops-nix ={
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    yazi.url = "github:sxyazi/yazi";
+
+    copyparty.url = "github:9001/copyparty";
+  };
+
+  outputs = { ... }@inputs: with inputs; let
+
+    system = "x86_64-linux";
+    simple-pkgs = import nixpkgs { inherit system; };
+    config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
+
+    hyper-base = rec {
       system  = "x86_64-linux";
       user    = "nx2";
+      domain  = "nx2.site";
+      home    = "/home/${user}";
+      webroot = "/var/lib/hugo/nx2site/public";
+    };
 
-    config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
+    get-pkgs = { host, system?system, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs {
+      inherit system config;
+      overlays = [(final: prev: {
+        unstable = import nixpkgs-unstable { inherit system config; };
+        latest   = import nixpkgs-latest   { inherit system config; };
+        inherit version;
+      })] ++ (if host == "NxACE" then [
+        copyparty.overlays.default
+      ] else []);
+    };
 
-    pkgs          = import nixpkgs          { inherit system config; };
-    pkgs-unstable = import nixpkgs-unstable { inherit system config; };
-    pkgs-latest   = import nixpkgs-latest   { inherit system config; };
-
-    nvidia-set    = import ./flake-modules/nvidia.nix;
+    nvidia-base = import ./flake-modules/nvidia.nix;
     secrets     = import ./git-crypt/secrets.nix;
-    rice          = import ./flake-modules/rice.nix pkgs;
+    rice        = import ./flake-modules/rice.nix simple-pkgs;
   in {
     nixosConfigurations = let
-      make-nixos-system = host: nixpkgs.lib.nixosSystem { 
-        inherit system;
+      make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
+        pkgs = get-pkgs { inherit host; };
         modules = [ ./configuration.nix ];
         specialArgs = let
-          nvidia = nvidia-set // {
-            enable = if (host == "NxXPS" || host == "NxNORTH") then true else false;
-            prime = if (host == "NxXPS") then true else false;
+          hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
+        in { inherit inputs hyper rice secrets; };
       };
-        in { inherit inputs user host pkgs-unstable pkgs-latest secrets rice nvidia; };
+      make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
+        pkgs = get-pkgs { inherit host; };
+        modules = [ ./wsl.nix ];
+        specialArgs = let
+          hyper = hyper-base // { inherit host; };
+          rice = import ./flake-modules/rice.nix pkgs;
+        in { inherit inputs hyper rice; };
       };
     in {
-      NxXPS = make-nixos-system "NxXPS";
-      NxNORTH = make-nixos-system "NxNORTH"; 
-      NxACE = make-nixos-system "NxACE"; 
+      NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; 
+      NxNORTH = make-nixos-system "NxNORTH" { enable = true; prime = false; }; 
+      NxACE = make-nixos-system "NxACE" { enable = false; };
+      NxDCS = make-nixos-wsl-system "NxDCS";
     };
 
+    nixOnDroidConfigurations = let
+      makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
+        pkgs = let
+          options = { inherit host; system = "aarch64-linux"; };
+        in (get-pkgs options) //
+          (get-pkgs (options // { version = "24.05"; nixpkgs = nixpkgs24; } )
+        );
+        modules = [ ./nod.nix ];
+        home-manager-path = home-manager24.outPath;
+        extraSpecialArgs = let
+          hyper = hyper-base // { 
+            inherit host;
+            system = "aarch64-linux";
+            user = "nix-on-droid";
+            home = "/data/data/com.termux.nix/files/home";
+          };
+          rice = import ./flake-modules/rice.nix pkgs;
+        in { inherit inputs hyper rice; };
+      };
+    in { NxS23U = makeNODConfiguration "NxS23U"; };
+
     homeConfigurations = let 
-      make-home-configuration = host: user: home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
+      make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
+        pkgs = get-pkgs { inherit host; };
         modules = [ ./home.nix ];
         extraSpecialArgs = let
-          nvidia = nvidia-set // {
-            enable = if (host == "NxXPS" || host == "NxNORTH") then true else false;
-            prime = if (host == "NxXPS") then true else false;
+          hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
+        in { inherit inputs hyper rice secrets; };
       };
-        in { inherit inputs system user host pkgs-unstable pkgs-latest rice secrets nvidia; };
+      make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
+        pkgs = get-pkgs { inherit host; };
+        modules = [ ./shell-only.nix ];
+        extraSpecialArgs = let
+          hyper = hyper-base // { inherit host; };
+        in { inherit inputs hyper rice secrets; };
       };
     in {
-      "${user}@NxXPS" = make-home-configuration "NxXPS" user; 
-      "${user}@NxNORTH" = make-home-configuration "NxNORTH" user; 
-      "${user}@NxACE" = make-home-configuration "NxACE" user; 
-      "tv@NxACE" = make-home-configuration "NxACE" "tv"; 
+      "${hyper-base.user}@NxXPS" = make-home-configuration "NxXPS" hyper-base.user { enable = true; prime = true; }; 
+      "${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; }; 
+      "${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; }; 
+
+      "${hyper-base.user}@NxDCS" = make-shell-configuration "NxDCS" hyper-base.user;
     };
   };
 }

home-modules/assets/gtk-2.0/apps.rc

@@ -1,92 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-  # Spin background
-  bg[NORMAL] = @base_color
-
-  engine "pixmap" {
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up-alt.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up-alt-disabled.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down-alt.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down-alt-disabled.png"
-      overlay_stretch = FALSE
-    }
-  }
-}
-
-style "chrome_gtk_frame" {
-  ChromeGtkFrame::frame-color                    = @titlebar_bg_color
-  ChromeGtkFrame::inactive-frame-color           = @titlebar_bg_color
-  ChromeGtkFrame::incognito-frame-color          = @titlebar_bg_color
-  ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-  ChromeGtkFrame::frame-gradient-size = 0
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"