flake.nix

@@ -15,22 +15,10 @@
       user = "torjus";
     in
     {
-      nixosConfigurations = {
+      nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
-        prismo = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
-          system = "x86_64-linux";
+        specialArgs = { inherit inputs self user; };
-          specialArgs = { inherit inputs self user; };
+        modules = [ ./hosts/prismo ];
-          modules = [ ./hosts/prismo ];
-        };
-        magicman = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = { inherit inputs self user; };
-          modules = [ ./hosts/magicman ];
-        };
-        gunter = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = { inherit inputs self user; };
-          modules = [ ./hosts/gunter ];
-        };
       };
     };
 }

home/editor/neovim/keybinds.lua

@@ -20,7 +20,3 @@ vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
 	{ desc = '[F]ind [F]iles' })
 vim.keymap.set('n', '<leader>fg', require('telescope.builtin').live_grep,
 	{ desc = '[F]ind by [G]rep' })
-
-vim.keymap.set('n', '<leader>tt', ':tabnew<cr>')
-vim.keymap.set('n', '<leader>tn', ':tabnext<cr>')
-vim.keymap.set('n', '<leader>tp', ':tabprevious<cr>')

home/packages/default.nix

@@ -6,14 +6,12 @@
     btop
     bzip2
     croc
-    easyeffects
     fd
     ffmpeg
     file
     go-task
     jq
     ncdu
-    mumble
     pamixer
     pinentry
     pre-commit

hosts/gunter/configuration.nix

@@ -1,74 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [ ./hardware-configuration.nix ];
-
-  # Bootloader stuff
-  boot.kernelParams = [
-    "quiet"
-    "splash"
-    "rd.systemd.show_status=false"
-  ];
-  boot.loader.systemd-boot = { enable = true; };
-  boot.loader.efi = { canTouchEfiVariables = true; };
-
-  # Networking stuff
-  networking.hostName = "gunter"; # Define your hostname.
-  networking.networkmanager.enable = true;
-
-  # Set time stuff
-  time.timeZone = "Europe/Oslo";
-
-  # Enable opengl
-  # hardware.opengl = {
-  #   enable = true;
-  #   extraPackages = with pkgs; [
-  #   ];
-  # };
-
-  # Setup hyprland
-  services.xserver.enable = true;
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    portalPackage = pkgs.xdg-desktop-portal-hyprland;
-  };
-
-  # Setup common XDG env vars
-  environment.sessionVariables = rec {
-    XDG_CACHE_HOME = "$HOME/.cache";
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_DATA_HOME = "$HOME/.local/share";
-    XDG_STATE_HOME = "$HOME/.local/state";
-    XDG_BIN_HOME = "$HOME/.local/bin";
-    PATH = [ "${XDG_BIN_HOME}" ];
-  };
-
-  # Setup xdg portal
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
-      xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ]);
-  };
-
-  # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  nixpkgs.config.allowUnfree = true;
-  # Install system-wide packages
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    curl
-    git
-  ];
-
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "23.11"; # Did you read the comment?
-}

hosts/gunter/default.nix

@@ -1,8 +0,0 @@
-{ inputs, self, pks, ... }: {
-  imports = [
-    ./configuration.nix
-    ./hardware-configuration.nix
-    ../../system
-    ../../home
-  ];
-}

hosts/magicman/configuration.nix

@@ -1,77 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [ ./hardware-configuration.nix ];
-
-  # Bootloader stuff
-  boot.kernelParams = [
-    "quiet"
-    "splash"
-    "rd.systemd.show_status=false"
-  ];
-  boot.loader.systemd-boot = { enable = true; };
-  boot.loader.efi = { canTouchEfiVariables = true; };
-
-  # Networking stuff
-  networking.hostName = "magicman"; # Define your hostname.
-  networking.networkmanager.enable = true;
-
-  # Set time stuff
-  time.timeZone = "Europe/Oslo";
-
-  # Enable opengl
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
-
-  # Setup hyprland
-  services.xserver.enable = true;
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    portalPackage = pkgs.xdg-desktop-portal-hyprland;
-  };
-
-  # Setup common XDG env vars
-  environment.sessionVariables = rec {
-    XDG_CACHE_HOME = "$HOME/.cache";
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_DATA_HOME = "$HOME/.local/share";
-    XDG_STATE_HOME = "$HOME/.local/state";
-    XDG_BIN_HOME = "$HOME/.local/bin";
-    PATH = [ "${XDG_BIN_HOME}" ];
-  };
-
-  # Setup xdg portal
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = (with pkgs; [
-      xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ]);
-  };
-
-  # Enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  nixpkgs.config.allowUnfree = true;
-  # Install system-wide packages
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    curl
-    git
-  ];
-
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "23.11"; # Did you read the comment?
-}

hosts/magicman/default.nix

@@ -1,8 +0,0 @@
-{ inputs, self, pks, ... }: {
-  imports = [
-    ./configuration.nix
-    ./hardware-configuration.nix
-    ../../system
-    ../../home
-  ];
-}

hosts/prismo/configuration.nix

@@ -9,10 +9,7 @@
     "splash"
     "rd.systemd.show_status=false"
   ];
-  boot.loader.systemd-boot = {
+  boot.loader.systemd-boot = { enable = true; };
-    enable = true;
-    configurationLimit = 10;
-  };
   boot.loader.efi = { canTouchEfiVariables = true; };
 
   # Networking stuff

system/users.nix

@@ -7,7 +7,6 @@
   # Setup torjus user
   users.users.torjus = {
     isNormalUser = true;
-    initialPassword = "password";
     home = "/home/torjus";
     description = "Torjus";
     shell = pkgs.zsh;