flake.nix

@@ -17,7 +17,7 @@
     # nix-colors.url = "github:misterio77/nix-colors";
   };
 
-  outputs = { nixpkgs, ... }@inputs: {
+  outputs = { nixpkgs, home-manager, ... }@inputs: {
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
@@ -33,12 +33,6 @@
         # > Our main nixos configuration file <
         modules = [ ./nixos/machines/lpt-mans/configuration.nix ];
       };
-
-      srv01-home = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit inputs; }; # Pass flake inputs to our config
-        # > Our main nixos configuration file <
-        modules = [ ./nixos/machines/srv01-home/configuration.nix ];
-      };
     };
   };
 }

home-manager/home.nix

@@ -9,8 +9,6 @@
 
     # You can also split up your configuration and import pieces of it here:
     ./nvim.nix
-    ./kitty.nix
-    ./zsh.nix
     # ./i3.nix
   ];
 
@@ -72,9 +70,6 @@
     enable = true;
   };
   	
-  services.dunst.enable = true;
-  services.flameshot.enable = true;
-  	
   services.playerctld.enable = true;
 
   # Enable home-manager and git

home-manager/i3.nix

@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+{
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = {
+      bars = [
+        {
+          position = "top";
+          statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
+        }
+      ];
+    };
+  };
+
+  programs.i3status-rust = {
+    enable = true;
+    bars = {
+      top = {
+        blocks = [
+         {
+           block = "time";
+           interval = 60;
+           format = "%a %d/%m %k:%M %p";
+         }
+       ];
+      };
+    };
+  };
+}

home-manager/kitty.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  home.file."./.config/kitty/" = {
-    source = ../package-configs/kitty;
-    recursive = true;
-  };
-}

home-manager/nvim.nix

@@ -8,8 +8,12 @@
     defaultEditor = true;
     extraConfig = ":luafile ~/.config/nvim/init.lua";
 
+    plugins = with pkgs.vimPlugins; [ 
+      
+    ];
     extraPackages = with pkgs; [
       gcc
+      vimPlugins.packer-nvim
       ripgrep
     ];
   };

home-manager/zsh.nix

@@ -1,22 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.zsh = {
-    enable = true;
-    # autocd = true;
-    # dotDir = ".config/zsh";
-    # enableAutosuggestions = true;
-    # enableCompletion = true;
-    shellAliases = {
-      l = "exa -l";
-      ssh = "TERM=xterm-256color ssh";
-    };
-    sessionVariables.PROMPT= ''%B%F{green}[%n@%m:%~]%f%b%F{green}$%f '';
-  };
-
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
-}

nixos/machines/lpt-mans/configuration.nix

@@ -9,35 +9,142 @@
     inputs.hardware.nixosModules.common-cpu-amd
     # inputs.hardware.nixosModules.common-gpu-nvidia
 
+    # You can also split up your configuration and import pieces of it here:
+    # ./users.nix
+    ./network.nix
+    ../../roles/desktop.nix
+
     # Import home-manager's NixOS module
     inputs.home-manager.nixosModules.home-manager
 
-    ./network.nix
+    # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
-
-    ../../modules
-
-    ../../roles/base.nix
-    ../../roles/desktop.nix
   ];
 
+  nixpkgs = {
+    # You can add overlays here
+    overlays = [
+      # If you want to use overlays exported from other flakes:
+      # neovim-nightly-overlay.overlays.default
+
+      # Or define it inline, for example:
+      # (final: prev: {
+      #   hi = final.hello.overrideAttrs (oldAttrs: {
+      #     patches = [ ./change-hello-to-hi.patch ];
+      #   });
+      # })
+    ];
+    # Configure your nixpkgs instance
+    config = {
+      # Disable if you don't want unfree packages
+      allowUnfree = true;
+    };
+  };
+
+  nix = {
+    # This will add each flake input as a registry
+    # To make nix3 commands consistent with your flake
+    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
+
+    # This will additionally add your inputs to the system's legacy channels
+    # Making legacy nix commands consistent as well, awesome!
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+
+    settings = {
+      # Enable flakes and new 'nix' command
+      experimental-features = "nix-command flakes";
+      # Deduplicate and optimize nix store
+      auto-optimise-store = true;
+    };
+  };
+
+  # TODO_: This is just an example, be sure to use whatever bootloader you prefer
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+
   # Setup keyfile
   boot.initrd.secrets = {
     "/crypto_keyfile.bin" = null;
   };
 
+  # FIXME_: Add the rest of your current configuration
+
+  # Set your time zone.
+  time.timeZone = "Europe/Amsterdam";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "nl_NL.UTF-8";
+    LC_IDENTIFICATION = "nl_NL.UTF-8";
+    LC_MEASUREMENT = "nl_NL.UTF-8";
+    LC_MONETARY = "nl_NL.UTF-8";
+    LC_NAME = "nl_NL.UTF-8";
+    LC_NUMERIC = "nl_NL.UTF-8";
+    LC_PAPER = "nl_NL.UTF-8";
+    LC_TELEPHONE = "nl_NL.UTF-8";
+    LC_TIME = "nl_NL.UTF-8";
+  };
+
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    # jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # TODO_: Configure your system-wide user settings (groups, etc), add more users as needed.
+  users.users = {
+    # FIXME_: Replace with your username
+    mans = {
+      # TODO_: You can set an initial password for your user.
+      # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install.
+      # Be sure to change it (using passwd) after rebooting!
+      isNormalUser = true;
+      openssh.authorizedKeys.keys = [
+        # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect
+      ];
+      # TODO_: Be sure to add any other groups you need (such as networkmanager, audio, docker, etc)
+      extraGroups = [ "wheel" "networkmanager" ];
+    };
+  };
+
   environment.systemPackages = with pkgs; [
     wget
     neovim
     openssl
   ];  
 
+  # This setups a SSH server. Very important if you're setting up a headless system.
+  # Feel free to remove if you don't need it.
+  services.openssh = {
+    enable = true;
+    settings = {
+      # Forbid root login through SSH.
+      PermitRootLogin = "no";
+      # Use keys only. Remove if you want to SSH using password (not recommended)
+      PasswordAuthentication = false;
+    };
+  };
+
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     users = {

nixos/machines/pc-mans/configuration.nix

@@ -9,55 +9,148 @@
     inputs.hardware.nixosModules.common-cpu-amd
     # inputs.hardware.nixosModules.common-gpu-nvidia
 
+    # You can also split up your configuration and import pieces of it here:
+    # ./users.nix
+    ./network.nix
+    ../../roles/desktop.nix
+
+    ../../modules/nvidia.nix
+
     # Import home-manager's NixOS module
     inputs.home-manager.nixosModules.home-manager
 
-    ./network.nix
+    # Import your generated (nixos-generate-config) hardware configuration
-
-    ../../roles/base.nix
-    ../../roles/desktop.nix
-
-    ../../modules/mans.nix
-    ../../modules/nvidia.nix
-    ../../modules/docker.nix
-
-    ../../modules/xmonad.nix
-
     ./hardware-configuration.nix
   ];
 
-  services.xserver.displayManager.setupCommands = ''
+  nixpkgs = {
-  ${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --rate 144.00 --size 1920x1080 --right-of HDMI-0 --primary --output HDMI-0 --auto
+    # You can add overlays here
-  '';
+    overlays = [
+      # If you want to use overlays exported from other flakes:
+      # neovim-nightly-overlay.overlays.default
 
+      # Or define it inline, for example:
+      # (final: prev: {
+      #   hi = final.hello.overrideAttrs (oldAttrs: {
+      #     patches = [ ./change-hello-to-hi.patch ];
+      #   });
+      # })
+    ];
+    # Configure your nixpkgs instance
+    config = {
+      # Disable if you don't want unfree packages
+      allowUnfree = true;
+    };
+  };
+
+  nix = {
+    # This will add each flake input as a registry
+    # To make nix3 commands consistent with your flake
+    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
+
+    # This will additionally add your inputs to the system's legacy channels
+    # Making legacy nix commands consistent as well, awesome!
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+
+    settings = {
+      # Enable flakes and new 'nix' command
+      experimental-features = "nix-command flakes";
+      # Deduplicate and optimize nix store
+      auto-optimise-store = true;
+    };
+  };
+
+  # TODO_: This is just an example, be sure to use whatever bootloader you prefer
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.supportedFilesystems = [ "zfs" ];
-  boot.zfs.forceImportRoot = false;
-  networking.hostId = "b28f793f";
-
 
   # Setup keyfile
   boot.initrd.secrets = {
     "/crypto_keyfile.bin" = null;
   };
 
-  services.xserver.displayManager.autoLogin.enable = false;
+  # FIXME_: Add the rest of your current configuration
-  services.xserver.displayManager.autoLogin.user = "mans";
+
+  # Set your time zone.
+  time.timeZone = "Europe/Amsterdam";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "nl_NL.UTF-8";
+    LC_IDENTIFICATION = "nl_NL.UTF-8";
+    LC_MEASUREMENT = "nl_NL.UTF-8";
+    LC_MONETARY = "nl_NL.UTF-8";
+    LC_NAME = "nl_NL.UTF-8";
+    LC_NUMERIC = "nl_NL.UTF-8";
+    LC_PAPER = "nl_NL.UTF-8";
+    LC_TELEPHONE = "nl_NL.UTF-8";
+    LC_TIME = "nl_NL.UTF-8";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    # jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # TODO_: Configure your system-wide user settings (groups, etc), add more users as needed.
+  users.users = {
+    # FIXME_: Replace with your username
+    mans = {
+      # TODO_: You can set an initial password for your user.
+      # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install.
+      # Be sure to change it (using passwd) after rebooting!
+      isNormalUser = true;
+      openssh.authorizedKeys.keys = [
+        # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect
+      ];
+      # TODO_: Be sure to add any other groups you need (such as networkmanager, audio, docker, etc)
+      extraGroups = [ "wheel" "networkmanager" ];
+    };
+  };
 
   environment.systemPackages = with pkgs; [
     wget
     neovim
     openssl
-    tree
-    file
-    inetutils
   ];  
 
+  # This setups a SSH server. Very important if you're setting up a headless system.
+  # Feel free to remove if you don't need it.
+  services.openssh = {
+    enable = true;
+    settings = {
+      # Forbid root login through SSH.
+      PermitRootLogin = "no";
+      # Use keys only. Remove if you want to SSH using password (not recommended)
+      PasswordAuthentication = false;
+    };
+  };
+
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     users = {
+      # Import your home-manager configuration
       mans = import ../../../home-manager/home.nix;
     };
   };

nixos/machines/pc-mans/network.nix

@@ -10,10 +10,10 @@
   networking.networkmanager.enable = true;
 
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 22 ];
+  # networking.firewall.allowedTCPPorts = [ 22 ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
-  # networking.firewall.enable = true;
+  networking.firewall.enable = false;
 
 
   # Set the hostname

nixos/machines/srv01-home/configuration.nix

@@ -1,114 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running `nixos-help`).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-
-      ../../modules/docker.nix
-
-      ../../roles/server.nix
-    ];
-  services.gitea-actions-runner.instances.test = {
-    enable = true;
-    name = "NixOs";
-    url = "https://git.mzsl.nl";
-    token = "kkhRRI5MsCDrqK30XLaLvSIYx5mjPUlJ0KBUl2OH";
-    labels = [
-      "ubuntu-latest:docker://node:16-bullseye" 
-      "ubuntu-22.04:docker://node:16-bullseye"
-      "ubuntu-20.04:docker://node:16-bullseye"
-      "ubuntu-18.04:docker://node:16-buster"
-    ];
-  };
-
-  # Use the systemd-boot EFI boot loader.
-  # boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.supportedFilesystems = [ "zfs" ];
-  boot.loader.grub.enable = true;
-  boot.loader.grub.efiSupport = true;
-  boot.loader.grub.device = "nodev";
-
-  boot.loader.grub.mirroredBoots = [
-    { devices = [ "/dev/disk/by-uuid/D527-57A9" ];
-      path = "/boot-fallback"; }
-  ];
-
-  networking = {
-    hostName = "srv01-home"; # Define your hostname.
-    hostId = "3bf26306";
-
-    interfaces.enp2s0.ipv4.addresses = [
-      {
-        address = "192.168.2.11";
-        prefixLength = 24;
-      }
-    ];
-
-    defaultGateway = "192.168.2.254";
-    nameservers = ["1.1.1.1" "8.8.8.8"];
-  };
-
-  # Configure keymap in X11
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.adminmz = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
-      curl
-    ];
-    openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDub2v/G51kGDqhQ4o7LN5ncq1oS0e14cjlibsPSfuPsGQBSFMojAUN8sYf43PrlzJs1nZsA3teF9SLmuWcyzcNXGKclhbj0AhN470l/G2SoEcIKDTgVJwNeQ7A/qzFSxmXIV7rmiPPADAyq0ykQA9MAD3f/+4KPiv3DgcU+9ZkSD1nbh4TGld44OLr70ozWBEdqlaUETIXKleEq/RbMcNi3YD89opafeeKpt6tMQydxcIFLUMimq3PiYVjJk4bypjB2r/jMAgnrE6nm96L8R8EZFMWsKpaL2s52NX90VIB69VMyQTdKdHEtxRWIwFR68E3YkYfyGZ5gyNIOaG4l0FyBVux21KxpR1kjhgm2JNw2moG0qwkpFI+Lu+3hqvUu0OM8otTpqGMWjTVs0yYsmIqwnEzEqAifdWxcLus6QLmz+61ajyQBlPBkJ6qFr9MhFvQOnuaUB461SkN/Rah3PU2wUSO9VvCcan2+l3M5zP2QJfPGfdS/mUHPuqCVzzXjNc= mzies@DESKTOP-AKMBK3I"
-    ];
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    git
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 80 443 22 ];
-  networking.firewall.allowedUDPPorts = [ 80 443 22 ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It's perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
-}
-

nixos/machines/srv01-home/hardware-configuration.nix

@@ -1,68 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "zroot/root";
-      fsType = "zfs";
-    };
-
-  fileSystems."/nix" =
-    { device = "zroot/root/nix";
-      fsType = "zfs";
-    };
-
-  fileSystems."/home" =
-    { device = "zroot/root/home";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var" =
-    { device = "zroot/root/var";
-      fsType = "zfs";
-    };
-
-  fileSystems."/data" =
-    { device = "droot/root";
-      fsType = "zfs";
-    };
-
-  fileSystems."/data/garage" =
-    { device = "droot/root/garage";
-      fsType = "zfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/D505-A0AE";
-      fsType = "vfat";
-    };
-
-  fileSystems."/boot-fallback" =
-    { device = "/dev/disk/by-uuid/D527-57A9";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

nixos/modules/common.nix

@@ -1,2 +0,0 @@
-{
-}

nixos/modules/default.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  imports = [
-    ./i18n.nix
-    ./nixconfig.nix
-  ];
-}

nixos/modules/docker.nix

@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  virtualisation.docker.enable = true;
-}

nixos/modules/i18n.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-    # Set your time zone.
-    time.timeZone = "Europe/Amsterdam";
-
-    # Select internationalisation properties.
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    i18n.extraLocaleSettings = {
-        LC_ADDRESS = "nl_NL.UTF-8";
-        LC_IDENTIFICATION = "nl_NL.UTF-8";
-        LC_MEASUREMENT = "nl_NL.UTF-8";
-        LC_MONETARY = "nl_NL.UTF-8";
-        LC_NAME = "nl_NL.UTF-8";
-        LC_NUMERIC = "nl_NL.UTF-8";
-        LC_PAPER = "nl_NL.UTF-8";
-        LC_TELEPHONE = "nl_NL.UTF-8";
-        LC_TIME = "nl_NL.UTF-8";
-    };
-}

nixos/modules/i3.nix

@@ -12,6 +12,11 @@
    
     displayManager.defaultSession = "none+i3";
     displayManager.lightdm.enable = true;
+    displayManager.autoLogin.enable = true;
+    displayManager.autoLogin.user = "mans";
+    displayManager.setupCommands = ''
+    ${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --rate 144.00 --size 1920x1080 --right-of HDMI-0 --primary --output HDMI-0 --auto
+    '';
 
     windowManager.i3 = {
       enable = true;
@@ -35,3 +40,4 @@
   # nvidia-drm.modeset=1 is required for some wayland compositors, e.g. sway
   hardware.nvidia.modesetting.enable = true;
 }
+

nixos/modules/mans.nix

@@ -1,12 +0,0 @@
-{ inputs, config, lib, pkgs, ... }:
-
-
-{
-  users.users.mans = {
-    isNormalUser = true;
-    openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDub2v/G51kGDqhQ4o7LN5ncq1oS0e14cjlibsPSfuPsGQBSFMojAUN8sYf43PrlzJs1nZsA3teF9SLmuWcyzcNXGKclhbj0AhN470l/G2SoEcIKDTgVJwNeQ7A/qzFSxmXIV7rmiPPADAyq0ykQA9MAD3f/+4KPiv3DgcU+9ZkSD1nbh4TGld44OLr70ozWBEdqlaUETIXKleEq/RbMcNi3YD89opafeeKpt6tMQydxcIFLUMimq3PiYVjJk4bypjB2r/jMAgnrE6nm96L8R8EZFMWsKpaL2s52NX90VIB69VMyQTdKdHEtxRWIwFR68E3YkYfyGZ5gyNIOaG4l0FyBVux21KxpR1kjhgm2JNw2moG0qwkpFI+Lu+3hqvUu0OM8otTpqGMWjTVs0yYsmIqwnEzEqAifdWxcLus6QLmz+61ajyQBlPBkJ6qFr9MhFvQOnuaUB461SkN/Rah3PU2wUSO9VvCcan2+l3M5zP2QJfPGfdS/mUHPuqCVzzXjNc= mzies@DESKTOP-AKMBK3I"
-    ];
-    extraGroups = [ "wheel" "networkmanager" ];
-  };
-}

nixos/modules/nixconfig.nix

@@ -1,44 +0,0 @@
-{ inputs, config, lib, pkgs, ... }:
-
-{
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # If you want to use overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
-    ];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-    };
-  };
-
-  nix = {
-    # This will add each flake input as a registry
-    # To make nix3 commands consistent with your flake
-    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
-
-    # This will additionally add your inputs to the system's legacy channels
-    # Making legacy nix commands consistent as well, awesome!
-    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-
-    settings = {
-      # Enable flakes and new 'nix' command
-      experimental-features = "nix-command flakes";
-      # Deduplicate and optimize nix store
-      auto-optimise-store = true;
-    };
-  };
-
-  nix.gc.automatic = true;
-  nix.gc.options = "--delete-older-than 30d";
-
-}

nixos/modules/overlays.nix

@@ -1,38 +0,0 @@
-
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # If you want to use overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
-    ];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-    };
-  };
-
-  nix = {
-    # This will add each flake input as a registry
-    # To make nix3 commands consistent with your flake
-    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
-
-    # This will additionally add your inputs to the system's legacy channels
-    # Making legacy nix commands consistent as well, awesome!
-    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-
-    settings = {
-      # Enable flakes and new 'nix' command
-      experimental-features = "nix-command flakes";
-      # Deduplicate and optimize nix store
-      auto-optimise-store = true;
-    };
-  };
-  }

nixos/modules/ssh.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.openssh = {
-    enable = true;
-    settings = {
-      # Forbid root login through SSH.
-      PermitRootLogin = "no";
-      # Use keys only. Remove if you want to SSH using password (not recommended)
-      PasswordAuthentication = false;
-    };
-  };
-}

nixos/modules/xmonad.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw 
-  # Define the i3 window manager configuration
-  services.xserver = {
-    windowManager.xmonad = {
-      enable = true;
-      enableContribAndExtras = true;
-    };
-  };
-}
-

nixos/roles/base.nix

@@ -1,14 +1,12 @@
 # Module arguments which our system can use to refer to its own configuration
-{ inputs, config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-imports = [
+  imports = [
-  ../modules
+  ];
-];
 
-options = {
+  options = {
-};
+  };
 
-config = {
+  config = {
-
+  };
-};
 }

nixos/roles/desktop.nix

@@ -1,30 +1,12 @@
 { config, lib, pkgs, ... }:
-
 {
-imports = [
+  imports = [
-  ../modules
+    ../modules/i3.nix
-  ../modules/i3.nix
+  ];
-];
 
-config = {
+  options = {
-  # Enable CUPS to print documents.
+  };
-  services.printing.enable = true;
+
-
+  config = {
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    # jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
   };
-};
 }

nixos/roles/server.nix

@@ -1,14 +1,12 @@
 # Module arguments which our system can use to refer to its own configuration
 { config, lib, pkgs, ... }:
 {
-imports = [
+  imports = [
-  ../modules/ssh.nix
+  ];
-];
 
-options = {
+  options = {
-};
+  };
 
-config = {
+  config = {
-  services.openssh.ports = [ 2022 ];
+  };
-};
 }

package-configs/kitty/kitty.conf

@@ -1,14 +0,0 @@
-globinclude kitty.d/**/*.conf
-envinclude KITTY_CONF_*
-
-background_opacity 0.9
-enable_audio_bell no
-
-map f9 close_other_windows_in_tab
-
-font_family      JetBrains Mono Regular Nerd Font Complete Mono
-bold_font        JetBrains Mono Bold Nerd Font Complete Mono
-italic_font      JetBrains Mono Italic Nerd Font Complete Mono
-bold_italic_font JetBrains Mono Bold Italic Nerd Font Complete Mono
-
-font_size 12.0

package-configs/kitty/kitty.d/my_theme.conf.bak

@@ -1,47 +0,0 @@
-background #0b092c
-foreground #e4e4ea
-
-cursor #fc8483
-cursor_text_color #fcfdfc
-selection_foreground #403e41
-selection_background #fcfcfa
-
-# dull black
-color0 #151337
-# light black
-color8 #727072
-
-# dull red
-color1 #ff6188
-# light red
-color9 #ff6188
-
-# dull green
-color2 #a9dc76
-# light green
-color10 #a9dc76
-
-# yellow
-color3 #ffd866
-# light yellow
-color11 #ffd866
-
-# blue
-color4 #fc9867
-# light blue
-color12 #fc9867
-
-# magenta
-color5 #ab9df2
-# light magenta
-color13 #ab9df2
-
-# cyan
-color6 #78dce8
-# light cyan
-color14 #78dce8
-
-# dull white
-color7 #fcfcfa
-# bright white
-color15 #fcfcfa

package-configs/kitty/kitty.d/theme.conf.bak

@@ -1,29 +0,0 @@
-# 1984 theme by Bertie Blackman, https://github.com/covertbert/iterm2-1984/
-
-foreground #ffffff
-background #0d0f31
-selection_foreground #000000
-selection_background #00d5eb
-color0 #000000
-color1 #ff16b0
-color2 #b3f361
-color3 #ffea16
-color4 #46bdff
-color5 #f806fa
-color6 #59e1e3
-color7 #feffff
-color8 #000000
-color9 #ff16b0
-color10 #b3f361
-color11 #ffea16
-color12 #46bdff
-color13 #f806fa
-color14 #6be4e6
-color15 #feffff
-
-# URL styles
-url_color #f806fa
-url_style single
-
-# Cursor styles
-cursor #59e1e3

package-configs/kitty/kitty.d/tokyonight_night.conf

@@ -1,50 +0,0 @@
-# vim:ft=kitty
-
-## name: Tokyo Night
-## license: MIT
-## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
-
-
-background #1a1b26
-foreground #c0caf5
-selection_background #33467c
-selection_foreground #c0caf5
-url_color #73daca
-cursor #c0caf5
-cursor_text_color #1a1b26
-
-# Tabs
-active_tab_background #7aa2f7
-active_tab_foreground #16161e
-inactive_tab_background #292e42
-inactive_tab_foreground #545c7e
-#tab_bar_background #15161e
-
-# Windows
-active_border_color #7aa2f7
-inactive_border_color #292e42
-
-# normal
-color0 #15161e
-color1 #f7768e
-color2 #9ece6a
-color3 #e0af68
-color4 #7aa2f7
-color5 #bb9af7
-color6 #7dcfff
-color7 #a9b1d6
-
-# bright
-color8 #414868
-color9 #f7768e
-color10 #9ece6a
-color11 #e0af68
-color12 #7aa2f7
-color13 #bb9af7
-color14 #7dcfff
-color15 #c0caf5
-
-# extended colors
-color16 #ff9e64
-color17 #db4b4b