flake.nix

@@ -26,6 +26,8 @@
     minimal-tmux = {
       url = "github:niksingh710/minimal-tmux-status";
       inputs.nixpkgs.follows = "nixpkgs";
+    disko.url = "github:nix-community/disko";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -39,6 +41,7 @@
       catppuccin,
       confetti,
       bbk,
+	  disko,
       ...
     }@inputs:
     let
@@ -85,6 +88,8 @@
             catppuccin.nixosModules.catppuccin
             confetti.nixosModules.default
             bbk.nixosModules.default
+            ./maskiner/core/disk-config.nix
+            disko.nixosModules.disko
           ];
 
         };

maskiner/core/hardware-configuration.nix

@@ -8,24 +8,24 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/23905182-cee8-4336-8b2f-803dbd761c84";
+    { device = "/dev/disk/by-uuid/751f2210-9f0a-46da-bc62-25ede9a5f8a7";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/39A0-5A5F";
+    { device = "/dev/disk/by-uuid/1947-AC4C";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/d599597d-d111-48a3-98e9-da81075e38f8"; }
+    [ { device = "/dev/disk/by-uuid/0eea714d-1c2f-4981-b25b-920205959594"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

moduler/base.nix

@@ -6,6 +6,9 @@
   ...
 }:
 {
+  sops.defaultSopsFile = ../secrets/sops.yaml;
+  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+
   nixpkgs = {
     config = {
       allowUnfree = true;
@@ -93,7 +96,7 @@
     garamond-libre
   ];
 
-  i18n.defaultLocale = "sv_SE.UTF-8";
+  i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "sv_SE.UTF-8";
     LC_IDENTIFICATION = "sv_SE.UTF-8";

moduler/dev.nix

@@ -1,6 +1,9 @@
 {
   inputs,
+  lib,
+  config,
   pkgs,
+  myhostname,
   ...
 }:
 let
@@ -19,23 +22,24 @@ in
 	inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default
 
   	# Nix
+    devenv
     nixfmt-rfc-style
 
 	# Docker
-    # dive
+    dive
     lazydocker
 
 	# Jobb
+    dotnetCorePackages.dotnet_9.sdk
     gh
-    # awscli
+    awscli
-    # minio-client
+    minio-client
-    # dotnetCorePackages.dotnet_9.sdk
 	# opentofu
     # azure-cli
     # jira-cli-go
 
 	# Blogging
-	# zola
+	zola
 
 	# System Design
     # sqlc
@@ -44,10 +48,10 @@ in
 
 	# Web Dev
     # tailwindcss
-    # prettierd
+    prettierd
 
 	# Go
-    # go
+    go
     # air
     # templ
     # go-migrate-pg
@@ -55,13 +59,13 @@ in
 	# Build
     git
     gcc
-    # gnumake
+    gnumake
-    # cmake
+    cmake
 
 	# System Tools
     yq
     jq
     git
-    # qrencode
+    qrencode
   ];
 }

moduler/lsp.nix

@@ -5,19 +5,23 @@
   ...
 }:
 {
+  options = {
+    typescript.enable = lib.mkEnableOption "enables kubernetes-tools";
+  };
 
+  config = lib.mkIf config.kubernetes-tools.enable {
     environment.systemPackages = with pkgs; [
       nixd
+      gopls
+      omnisharp-roslyn
       dockerfile-language-server
       bash-language-server
       helm-ls
       yaml-language-server
       lua-language-server
       marksman
+      tofu-ls
 
-    # tofu-ls
-    # gopls
-    # omnisharp-roslyn
       # nodejs_22
       # vue-language-server
       # vtsls
@@ -26,4 +30,5 @@
       # nodePackages.vscode-json-languageserver
       # tailwindcss-language-server
     ];
+  };
 }

moduler/network.nix

@@ -15,12 +15,13 @@
   };
 
   environment.systemPackages = with pkgs; [
-    # networkmanager
+    networkmanagerapplet
+    networkmanager
+    iperf3
     dnsutils
-    # nmap
+    aria2
-    # ipcalc
+    nmap
-    # iperf3
+    ipcalc
-    # networkmanagerapplet
 
     # (octodns.withProviders (ps: [
     #   octodns-providers.gandi

moduler/programs.nix

@@ -18,41 +18,7 @@
       via
     ];
   };
-  home-manager.users.fw = {
+
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "text/html" = "librewolf.desktop";
-        "x-scheme-handler/http" = "librewolf.desktop";
-        "x-scheme-handler/https" = "librewolf.desktop";
-        "x-scheme-handler/about" = "librewolf.desktop";
-        "x-scheme-handler/unknown" = "librewolf.desktop";
-        "text/plain" = "nvim.desktop";
-        "text/markdown" = "nvim.desktop";
-        "text/x-markdown" = "nvim.desktop";
-        "application/json" = "nvim.desktop";
-        "application/x-ndjson" = "nvim.desktop";
-        "application/x-yaml" = "nvim.desktop";
-        "text/yaml" = "nvim.desktop";
-        "text/x-shellscript" = "nvim.desktop";
-        "text/x-python" = "nvim.desktop";
-        "text/x-csrc" = "nvim.desktop";
-        "text/x-c++src" = "nvim.desktop";
-        "application/x-sql" = "nvim.desktop";
-        "text/xml" = "nvim.desktop";
-        "application/xml" = "nvim.desktop";
-        "application/pdf" = "org.gnome.Evince.desktop";
-        "image/jpeg" = "feh.desktop";
-        "image/png" = "feh.desktop";
-        "image/gif" = "feh.desktop";
-        "image/webp" = "feh.desktop";
-        "image/tiff" = "feh.desktop";
-        "image/bmp" = "feh.desktop";
-        "image/svg+xml" = "feh.desktop";
-      };
-    };
-  };
-  environment.sessionVariables.DEFAULT_BROWSER = "${pkgs.librewolf}/bin/librewolf";
 
   environment.systemPackages = with pkgs; [
     # GUI

moduler/programs/waybar/waybar-latte.css

@@ -60,14 +60,14 @@ button {
 /* hover */
 button:hover {
   background: rgba(255,255,255,0.08);
-  box-shadow: inset 0 -3px @peach;
+  box-shadow: inset 0 -3px @green;
 }
 
 /* active (no CSS transform in GTK; simulate press with padding + shadow) */
 button:active {
   padding-top: 1px;      /* nudge down visually */
   padding-bottom: 1px;   /* keep height stable */
-  box-shadow: inset 0 -2px @peach;
+  box-shadow: inset 0 -2px @green;
   color: @base;
 }
 
@@ -88,9 +88,9 @@ button:active {
 }
 
 #workspaces button.active, #workspaces button.focused {
-  background: @peach;
+  background: @green;
   color: @base;
-  box-shadow: inset 0 -3px @peach;
+  box-shadow: inset 0 -3px @green;
 }
 
 #workspaces button.urgent {
@@ -101,7 +101,7 @@ button:active {
 
 /* -------- Clock -------- */
 #clock {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -109,7 +109,7 @@ button:active {
 
 /* -------- Mpris -------- */
 #mpris {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -117,7 +117,7 @@ button:active {
 
 /* -------- Pavu -------- */
 #pulseaudio {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -125,7 +125,7 @@ button:active {
 
 /* -------- Bluetooth -------- */
 #bluetooth {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -133,7 +133,7 @@ button:active {
 
 /* -------- Upower -------- */
 #upower {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -141,7 +141,7 @@ button:active {
 
 /* -------- Network -------- */
 #network {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -149,5 +149,5 @@ button:active {
 
 /* -------- Helpers -------- */
 @keyframes blink {
-  to { background-color: @peach; color: @base; }
+  to { background-color: @green; color: @base; }
 }

moduler/programs/waybar/waybar-mocha.css

@@ -60,14 +60,14 @@ button {
 /* hover */
 button:hover {
   background: rgba(255,255,255,0.08);
-  box-shadow: inset 0 -3px @peach;
+  box-shadow: inset 0 -3px @green;
 }
 
 /* active (no CSS transform in GTK; simulate press with padding + shadow) */
 button:active {
   padding-top: 1px;      /* nudge down visually */
   padding-bottom: 1px;   /* keep height stable */
-  box-shadow: inset 0 -2px @peach;
+  box-shadow: inset 0 -2px @green;
   color: @base;
 }
 
@@ -88,9 +88,9 @@ button:active {
 }
 
 #workspaces button.active, #workspaces button.focused {
-  background: @peach;
+  background: @green;
   color: @base;
-  box-shadow: inset 0 -3px @peach;
+  box-shadow: inset 0 -3px @green;
 }
 
 #workspaces button.urgent {
@@ -101,7 +101,7 @@ button:active {
 
 /* -------- Clock -------- */
 #clock {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -109,7 +109,7 @@ button:active {
 
 /* -------- Mpris -------- */
 #mpris {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -117,7 +117,7 @@ button:active {
 
 /* -------- Pavu -------- */
 #pulseaudio {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -125,7 +125,7 @@ button:active {
 
 /* -------- Bluetooth -------- */
 #bluetooth {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -133,7 +133,7 @@ button:active {
 
 /* -------- Upower -------- */
 #upower {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -141,7 +141,7 @@ button:active {
 
 /* -------- Network -------- */
 #network {
-  background: @peach;
+  background: @green;
   color: @base;
   font-weight: 600;
   letter-spacing: 0.2px;
@@ -149,5 +149,5 @@ button:active {
 
 /* -------- Helpers -------- */
 @keyframes blink {
-  to { background-color: @peach; color: @base; }
+  to { background-color: @green; color: @base; }
 }

moduler/services/nextcloud/default.nix

@@ -1,102 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  myhost,
-  ...
-}:
-let
-  cfg = config.services.nextcloud;
-  srv = cfg.settings.server;
-in
-with lib;
-{
-  options = {
-    nextcloud = {
-      enable = mkEnableOption "enables nextcloud";
-      port = lib.mkOption {
-        type = lib.types.int;
-        default = 8003;
-        description = "The port that Nextcloud is served on.";
-      };
-      domain = lib.mkOption {
-        type = lib.types.str;
-        default = "files.wastring.com";
-        description = "The hostname that Nextcloud is served on.";
-      };
-    };
-  };
-  config = mkMerge [
-    (mkIf config.nextloud.enable {
-      services.nginx = {
-        virtualHosts.${config.nextcloud.domain} = {
-          forceSSL = true;
-          enableACME = true;
-        };
-      };
-
-      sops.secrets.nextcloud-admin-password = { };
-      sops.secrets.nextcloud-fw-password = { };
-      sops.secrets.nextcloud-disa-password = { };
-
-      services.nextcloud = {
-        enable = true;
-        package = pkgs.nextcloud31;
-        hostName = config.nextcloud.domain;
-        https = true;
-        configureRedis = true;
-        config.adminpassFile = config.sops.secrets.nextcloud-admin-password.path;
-        config.dbtype = "sqlite";
-        ensureUsers = {
-          fw = {
-            email = "fredrik@wastring.com";
-            passwordFile = config.sops.secrets.nextcloud-fw-password.path;
-          };
-          disa = {
-            email = "disahorner@hotmail.com";
-            passwordFile = config.sops.secrets.nextcloud-disa-password.path;
-          };
-        };
-        extraApps = {
-          inherit (config.services.nextcloud.package.packages.apps)
-            contacts
-            calendar
-            onlyoffice
-            ;
-        };
-        extraAppsEnable = true;
-        settings.enabledPreviewProviders = [
-          "OC\\Preview\\BMP"
-          "OC\\Preview\\GIF"
-          "OC\\Preview\\JPEG"
-          "OC\\Preview\\Krita"
-          "OC\\Preview\\MarkDown"
-          "OC\\Preview\\MP3"
-          "OC\\Preview\\OpenDocument"
-          "OC\\Preview\\PNG"
-          "OC\\Preview\\TXT"
-          "OC\\Preview\\XBitmap"
-          "OC\\Preview\\HEIC"
-        ];
-      };
-
-      services.fail2ban = {
-        enable = true;
-        jails = {
-          nextcloud.settings = {
-            backend = "systemd";
-            journalmatch = "SYSLOG_IDENTIFIER=Nextcloud";
-            enabled = true;
-            port = 443;
-            protocol = "tcp";
-            filter = "nextcloud";
-            maxretry = 3;
-            bantime = 86400;
-            findtime = 43200;
-          };
-        };
-      };
-    })
-  ];
-
-}

moduler/system.nix

@@ -21,6 +21,9 @@
 
     poppler-utils
 
+    imagemagick
+    pandoc
+
     alsa-utils
 
 	sops
@@ -30,16 +33,19 @@
     wget
     htop
     procps
+    btop
+    procs
+    dysk
     grc
     vim
     fastfetch
 	bc
 
-    # sysstat
+    sysstat
-    # lm_sensors
+    lm_sensors
-    # ethtool
+    ethtool
-    # pciutils
+    pciutils
-    # usbutils
+    usbutils
 
     fzf
     eza
@@ -51,37 +57,40 @@
     fortune
     cowsay
 
+    openssl
+
     lazygit
 	hyprpicker	
     typst
     typstyle
     tinymist
-    # (
+
-    #   let
+    (
-    #     base = pkgs.appimageTools.defaultFhsEnvArgs;
+      let
-    #   in
+        base = pkgs.appimageTools.defaultFhsEnvArgs;
-    #   pkgs.buildFHSEnv (
+      in
-    #     base
+      pkgs.buildFHSEnv (
-    #     // {
+        base
-    #       name = "fhs";
+        // {
-    #       targetPkgs =
+          name = "fhs";
-    #         pkgs:
+          targetPkgs =
-    #         # pkgs.buildFHSUserEnv provides only a minimal FHS environment,
+            pkgs:
-    #         # lacking many basic packages needed by most software.
+            # pkgs.buildFHSUserEnv provides only a minimal FHS environment,
-    #         # Therefore, we need to add them manually.
+            # lacking many basic packages needed by most software.
-    #         #
+            # Therefore, we need to add them manually.
-    #         # pkgs.appimageTools provides basic packages required by most software.
+            #
-    #         (base.targetPkgs pkgs)
+            # pkgs.appimageTools provides basic packages required by most software.
-    #         ++ (with pkgs; [
+            (base.targetPkgs pkgs)
-    #           pkg-config
+            ++ (with pkgs; [
-    #           ncurses
+              pkg-config
-    #           # Feel free to add more packages here if needed.
+              ncurses
-    #         ]);
+              # Feel free to add more packages here if needed.
-    #       profile = "export FHS=1";
+            ]);
-    #       runScript = "bash";
+          profile = "export FHS=1";
-    #       extraOutputsToInstall = [ "dev" ];
+          runScript = "bash";
-    #     }
+          extraOutputsToInstall = [ "dev" ];
-    #   )
+        }
-    # )
+      )
+    )
   ];
 }

moduler/users.nix

@@ -4,13 +4,13 @@
   ...
 }:
 {
-#  sops.secrets.user-password = { };
+  sops.secrets.user-password = { };
   users = {
     defaultUserShell = pkgs.bash;
+    mutableUsers = false;
     users = {
       fw = {
-        #	hashedPasswordFile = config.sops.secrets.user-password.path;
+        hashedPasswordFile = config.sops.secrets.user-password.path;
-	initialPassword = "password";
         isNormalUser = true;
         description = "Fredrik Wastring";
         extraGroups = [