Update packages

flake.nix

@@ -58,13 +58,13 @@
 
     lanzaboote.url = "github:nix-community/lanzaboote";
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    hyprland.url = "github:hyprwm/Hyprland?submodules=1";
     hyprgrass = {
       url = "github:horriblename/hyprgrass";
       inputs.hyprland.follows = "hyprland";
     };
-    neovim-flake = {
+    nvf = {
-      url = "github:notashelf/neovim-flake";
+      url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

homes/floppydisk/default.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     ./packages.nix # home.packages and similar stuff
-    ./neovim-flake.nix
+    ./nvf.nix
     ./ssh.nix
     ./git.nix
   ];

homes/floppydisk/nvf.nix

@@ -4,10 +4,10 @@
   ...
 }: {
   imports = [
-    inputs.neovim-flake.homeManagerModules.default
+    inputs.nvf.homeManagerModules.default
   ];
 
-  programs.neovim-flake = {
+  programs.nvf = {
     enable = true;
     settings = {
       vim = {
@@ -92,52 +92,53 @@
       };
 
       vim.filetree = {
-                nvimTree = {
+        nvimTree = {
           enable = true;
           openOnSetup = true;
-          disableNetrw = true;
+          setupOpts = {
+            disable_netrw = true;
 
-          hijackUnnamedBufferWhenOpening = true;
+            hijack_unnamed_buffer_when_opening = true;
-          hijackCursor = true;
+            hijack_cursor = true;
-          hijackDirectories = {
+            hijack_directories = {
-            enable = true;
+              enable = true;
-            autoOpen = true;
+              autoOpen = true;
-          };
-
-          git = {
-            enable = true;
-            showOnDirs = false;
-            timeout = 100;
-          };
-
-          view = {
-            preserveWindowProportions = false;
-            cursorline = false;
-            width = {
-              min = 35;
-              max = -1;
-              padding = 1;
             };
-          };
 
-          renderer = {
+            git = {
-            indentMarkers.enable = true;
+              enable = true;
-            rootFolderLabel = false;
+              showOnDirs = false;
-
+              timeout = 100;
-            icons = {
-              modifiedPlacement = "after";
-              gitPlacement = "after";
-              show.git = true;
-              show.modified = true;
             };
-          };
 
-          diagnostics.enable = true;
+            view = {
+              cursorline = false;
+              width = {
+                min = 35;
+                max = -1;
+                padding = 1;
+              };
+            };
 
-          modified = {
+            renderer = {
-            enable = true;
+              indent_markers.enable = true;
-            showOnDirs = false;
+              root_folder_label = false;
-            showOnOpenDirs = true;
+
+              icons = {
+                modified_placement = "after";
+                git_placement = "after";
+                show.git = true;
+                show.modified = true;
+              };
+            };
+
+            diagnostics.enable = true;
+
+            modified = {
+              enable = true;
+              show_on_dirs = false;
+              show_on_open_dirs = true;
+            };
           };
 
           mappings = {
@@ -162,7 +163,7 @@
       vim.git = {
         enable = true;
         gitsigns.enable = true;
-        gitsigns.codeActions = false;
+        gitsigns.codeActions.enable = false;
       };
 
       vim.minimap = {
@@ -210,7 +211,7 @@
         noice.enable = true;
         smartcolumn = {
           enable = true;
-          columnAt.languages = {
+          setupOpts.custom_colorcolumn = {
             nix = 150;
             ruby = 110;
             java = 120;

homes/floppydisk/packages.nix

@@ -9,7 +9,6 @@
     yt-dlp
     _1password-gui
     _1password
-    git-credential-1password
     firefox-devedition
     rdesktop
     _3llo
@@ -63,7 +62,6 @@
     jetbrains.rider
     jetbrains.phpstorm
     jetbrains.idea-ultimate
-    jetbrains.webstorm
     lazygit
     wakatime
     mongodb-compass
@@ -105,7 +103,6 @@
     pcsx2
     steam
     gzdoom
-    minecraft
     dolphin-emu
     prismlauncher
     fceux

hosts/banana/configuration.nix

@@ -0,0 +1,189 @@
+# This is your system's configuration file.
+# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  # You can import other NixOS modules here
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  services.xserver = {
+    enable = true;
+    xkb.layout = "us";
+  };
+
+  services.libinput.enable = true;
+
+
+  services.tailscale.enable = true;
+
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  nixpkgs = {
+    # 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;
+    };
+  };
+
+  # the configuration (pain)
+  programs = {
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+    hyprland = {
+      enable = true;
+      xwayland.enable = true;
+    };
+    zsh.enable = true;
+  };
+
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    gcc
+    git
+    grim
+    lxqt.lxqt-policykit
+    pavucontrol
+    pciutils
+    pulseaudio
+    screen
+    slurp
+    usbutils
+    wget
+    wl-clipboard
+    xdg-utils
+    swaynotificationcenter
+    swayidle
+    wofi
+    swaylock
+    gnome.gnome-keyring
+    gtklock
+    tailscale
+  ];
+
+  services.printing.enable = true;
+
+  fonts.packages = with pkgs; [
+    font-awesome
+    nerdfonts
+    jetbrains-mono
+    winePackages.fonts
+  ];
+
+  networking.hostName = "banana";
+  networking.networkmanager.enable = true;
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.efiSupport = false;
+
+  #boot.loader.systemd-boot.enable = true;
+  #boot.loader.efi.canTouchEfiVariables = true;
+  boot.initrd.systemd.enable = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # Set a time zone, idiot
+  time.timeZone = "Europe/London";
+
+  # Fun internationalisation stuffs (AAAAAAAA)
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_GB.UTF-8";
+    LC_IDENTIFICATION = "en_GB.UTF-8";
+    LC_MEASUREMENT = "en_GB.UTF-8";
+    LC_MONETARY = "en_GB.UTF-8";
+    LC_NAME = "en_GB.UTF-8";
+    LC_NUMERIC = "en_GB.UTF-8";
+    LC_PAPER = "en_GB.UTF-8";
+    LC_TELEPHONE = "en_GB.UTF-8";
+    LC_TIME = "en_GB.UTF-8";
+  };
+
+  # define user acc
+  users.users.floppydisk = {
+    isNormalUser = true;
+    description = "Frankie B.";
+    extraGroups = ["networkmanager" "wheel"];
+    openssh.authorizedKeys.keys = [
+      # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect
+    ];
+    shell = pkgs.zsh;
+  };
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+  };
+
+  # 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;
+
+  services.greetd = {
+    enable = true;
+    restart = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        user = "greeter";
+      };
+    };
+  };
+
+  systemd.services.greetd.serviceConfig = {
+    Type = "idle";
+    StandardInput = "tty";
+    StandardOutput = "tty";
+    StandardError = "journal";
+    TTYReset = "true";
+    TTYHangup = "true";
+    TTYVTDisallocate = true;
+  };
+
+  systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
+
+  security.pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock";
+
+  networking.firewall.enable = false;
+
+  system.stateVersion = "24.05";
+}

hosts/banana/hardware-configuration.nix

@@ -0,0 +1,34 @@
+# 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 = [ "ahci" "ohci_pci" "ehci_pci" "xhci_pci" "pata_jmicron" "aic7xxx" "firewire_ohci" "usb_storage" "usbhid" "floppy" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/805a68e8-b1d8-40b3-a264-58a90044b610";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/5190c160-67ec-45b2-bded-b7e6f858cb76"; }
+    ];
+
+  # 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.enp6s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/default.nix

@@ -30,4 +30,13 @@ in {
       home
     ];
   };
+
+  "banana" = mkSystem {
+    specialArgs = commonArgs;
+    modules = [
+      ./banana/configuration.nix
+      home-manager
+      home
+    ];
+  };
 }