cleanup

flake.nix

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

moduler/base.nix

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

moduler/dev.nix

@@ -1,9 +1,6 @@
 {
   inputs,
-  lib,
-  config,
   pkgs,
-  myhostname,
   ...
 }:
 let
@@ -22,24 +19,23 @@ 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
@@ -48,10 +44,10 @@ in
 
 	# Web Dev
     # tailwindcss
-    prettierd
+    # prettierd
 
 	# Go
-    go
+    # go
     # air
     # templ
     # go-migrate-pg
@@ -59,13 +55,13 @@ in
 	# Build
     git
     gcc
-    gnumake
+    # gnumake
-    cmake
+    # cmake
 
 	# System Tools
     yq
     jq
     git
-    qrencode
+    # qrencode
   ];
 }

moduler/lsp.nix

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

moduler/network.nix

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

moduler/programs.nix

@@ -8,17 +8,51 @@
 {
   services.udev = {
     extraRules = ''
-      			KERNEL=="ttyACM0", MODE:="666"
+      		KERNEL=="ttyACM0", MODE:="666"
-      			ACTION=="add", KERNEL=="sd[a-e][0-9]", ENV{ID_FS_UUID}=="3039-3932", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/sdcard"
+      		ACTION=="add", KERNEL=="sd[a-e][0-9]", ENV{ID_FS_UUID}=="3039-3932", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/sdcard"
-      			ACTION=="add", KERNEL=="sd[a-e]", ENV{ID_FS_UUID}=="66BA-4EBA", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/kobo"
+      		ACTION=="add", KERNEL=="sd[a-e]", ENV{ID_FS_UUID}=="66BA-4EBA", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/kobo"
-				KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput"
+      		KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput"
-      		'';
+      	'';
     packages = with pkgs; [
       vial
       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
@@ -29,10 +63,10 @@
     slack
     drawio
     evince
-	spotify
+    spotify
-	firefox
+    firefox
 
-	# ansible
+    # ansible
     # freecad-wayland
 
     # TUI

moduler/system.nix

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