unlinkified

hosts/common/base.nix

@@ -66,37 +66,6 @@
   };
   security.sudo.wheelNeedsPassword = false;
 
-  services = {
-    printing.enable = true;
-    pulseaudio.enable = false;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      pulse.enable = true;
-      jack.enable = true;
-    };
-    xserver.xkb.layout = "se";
-    displayManager = {
-      gdm.enable = true;
-      gdm.wayland = true;
-    };
-    desktopManager.gnome.enable = true;
-    gnome = {
-      gnome-keyring.enable = true;
-      gnome-initial-setup.enable = false;
-    };
-  }; # end services
-
-  services.fwupd.enable = true;
-  programs = {
-    dconf.enable = true;
-    fish.enable = true;
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-    };
-  }; # end programs
-
   environment = {
     systemPackages = with pkgs; [
       # CLI tools
@@ -117,55 +86,16 @@
       fish
       powershell
 
-      # Chat
-      discord
-      signal-desktop
-      
-      # Browser
-      firefox
-      firefoxpwa
-      
-      # Development
-      vscode
-      devenv
-      direnv
-      
       # Virtualization
-      podman
-      
-      # GNOME tweaks and extensions
-      gnome-tweaks
-      dconf-editor
-      gnomeExtensions.ddterm
-
-      # Other
-      syncthing
-      steam
-      krita
-      edk2-uefi-shell
-      obsidian
-      gparted
+      podman  
     ]; # end systemPackages
 
-    gnome.excludePackages = with pkgs; [
-      evolution
-      geary
-      gnome-contacts
-      gnome-music
-      gnome-user-docs
-      gnome-tour
-      gnome-weather
-      gnome-maps
-      gnome-calendar
-      gnome-initial-setup
-      gnome-clocks
-    ]; # end gnome.excludePackages
     shells = with pkgs; [ 
       bash
       nushell
       fish
       powershell
-       ];
+    ];
   }; # end environment
 
   virtualisation.podman = {

hosts/common/server.nix

@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{  
+  services = {
+    openssh.enable = true;
+  }; # end services
+
+  services.fwupd.enable = true;
+
+  environment = {
+    systemPackages = with pkgs; [
+      devenv
+      direnv
+    ]; # end systemPackages
+  }; # end environment
+} # end file

hosts/common/workstation.nix

@@ -0,0 +1,79 @@
+{ config, pkgs, ... }:
+
+{
+  security.sudo.wheelNeedsPassword = false;
+
+  services = {
+    printing.enable = true;
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+    xserver.xkb.layout = "se";
+    displayManager = {
+      gdm.enable = true;
+      gdm.wayland = true;
+    };
+    desktopManager.gnome.enable = true;
+    gnome = {
+      gnome-keyring.enable = true;
+      gnome-initial-setup.enable = false;
+    };
+  }; # end services
+
+  services.fwupd.enable = true;
+  programs = {
+    dconf.enable = true;
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+    };
+  }; # end programs
+
+  environment = {
+    systemPackages = with pkgs; [
+      # Chat
+      discord
+      signal-desktop
+      
+      # Browser
+      firefox
+      firefoxpwa
+      
+      # Development
+      vscode
+      devenv
+      direnv
+      
+      # GNOME tweaks and extensions
+      gnome-tweaks
+      dconf-editor
+      gnomeExtensions.ddterm
+
+      # Other
+      syncthing
+      steam
+      krita
+      edk2-uefi-shell
+      obsidian
+      gparted
+    ]; # end systemPackages
+
+    gnome.excludePackages = with pkgs; [
+      evolution
+      geary
+      gnome-contacts
+      gnome-music
+      gnome-user-docs
+      gnome-tour
+      gnome-weather
+      gnome-maps
+      gnome-calendar
+      gnome-initial-setup
+      gnome-clocks
+    ]; # end gnome.excludePackages
+  }; # end environment
+} #end file

hosts/tesla-nixos/configuration.nix

@@ -10,123 +10,4 @@
       enable = true;
     }; # end loader.systemd-boot
   }; # end boot
-  system.stateVersion = "24.05";
-  system.autoUpgrade = {
-    enable = true;
-    persistent = true;
-    flake = "/home/alisceon/nixos_config";
-    flags = [
-      "--update-input"
-      "nixpkgs"
-      "-L"
-    ];
-    dates = "daily";
-  }; # end system.autoUpgrade
-
-  nix = {
-    settings = {
-      experimental-features = [ "nix-command" "flakes" ];
-      auto-optimise-store = true;
-      trusted-users = [ "root" "alisceon" ];
-    }; # end settings
-    gc = {
-      automatic = true;
-      persistent = true;
-      dates = "daily";
-      options = "--delete-older-than 7d";
-    }; # end gc
-    registry = {
-      templates.to = {
-        type = "git";
-        url = "git+ssh://git@git.malice.zone/alisceon/devenv_templates.git";
-      }; # end templates.to
-      nixpkgs.to = {
-        type = "github";
-        owner = "NixOS";
-        repo = "nixpkgs";
-        ref = "nixos-unstable";
-      }; # end nixpkgs.to
-      nixpkgs-stable.to = {
-        type = "github";
-        owner = "NixOS";
-        repo = "nixpkgs";
-        ref = "nixos-25.05";
-      }; # end nixpkgs.to
-    }; #end registry
-  }; #end nix
-
-  console.keyMap = "sv-latin1";
-  networking.networkmanager.enable = true;
-  time.timeZone = "Europe/Stockholm";
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "sv_SE.UTF-8";
-    LC_IDENTIFICATION = "sv_SE.UTF-8";
-    LC_MEASUREMENT = "sv_SE.UTF-8";
-    LC_MONETARY = "sv_SE.UTF-8";
-    LC_NAME = "sv_SE.UTF-8";
-    LC_NUMERIC = "sv_SE.UTF-8";
-    LC_PAPER = "sv_SE.UTF-8";
-    LC_TELEPHONE = "sv_SE.UTF-8";
-    LC_TIME = "sv_SE.UTF-8";
-  };
-  security.sudo.wheelNeedsPassword = false;
-
-  services = {
-    openssh.enable = true;
-  }; # end services
-
-  services.fwupd.enable = true;
-  programs = {
-    dconf.enable = true;
-    fish.enable = true;
-  }; # end programs
-
-  environment = {
-    systemPackages = with pkgs; [
-      # CLI tools
-      git
-      wget
-      curl
-      btop # system monitor
-      ripgrep # grep replacement
-      bat # cat replacement
-      fd # find replacement
-      eza # ls replacement
-      nh # nix helper
-      jq # JSON processor
-
-      # Shells
-      bash
-      nushell
-      fish
-      powershell
-
-      devenv
-      direnv
-      
-      # Virtualization
-      podman
-      
-    ]; # end systemPackages
-
-    shells = with pkgs; [ 
-      bash
-      nushell
-      fish
-      powershell
-       ];
-  }; # end environment
-
-  virtualisation.podman = {
-    enable = true;
-    dockerCompat = true;
-    defaultNetwork.settings.dns_enabled = true;
-  }; # end virtualisation
-
-  users.users.alisceon = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "podman" ];
-    shell = pkgs.nushell;
-  }; # end users
 } # end file