Flatten dir structure

• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/2a34566b67bef34c551f204063faeecc444ae9da' (2024-02-25)
  → 'github:NixOS/nixpkgs/fcea2b6260dd566c28c894b4207a5f2b56c2cba3' (2024-02-26)

Makefile

@@ -8,7 +8,7 @@ HOSTNAME ?= $(shell hostname)
 UNAME_S := $(shell uname -s)
 
 ifeq ($(UNAME_S),Linux)
-	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#'
+	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#'
 endif
 ifeq ($(UNAME_S),Darwin)
 	SWITCH_CMD := exec darwin-rebuild switch --flake .
@@ -18,7 +18,7 @@ switch:
 	$(SWITCH_CMD)
 
 rollback:
-	nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix"
+	nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config="machines/$(HOSTNAME)/configuration.nix"
 
 update:
 	@./nix-flake-update.sh

flake.lock

@@ -204,11 +204,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1708847675,
+        "lastModified": 1708943256,
-        "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=",
+        "narHash": "sha256-K9VeHrhXsigdhNMZ8hqAk7jtRy4ollqhkYYNZqbfssg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2a34566b67bef34c551f204063faeecc444ae9da",
+        "rev": "fcea2b6260dd566c28c894b4207a5f2b56c2cba3",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -543,7 +543,7 @@ in {
     firefox = {
       enable = stdenv.isLinux;
 
-      package = unstable.firefox-devedition;
+      package = pkgs.firefox-devedition;
 
       profiles = {
         default = {

machines/hephaestus/configuration.nix

@@ -3,7 +3,21 @@
   pkgs,
   unstable,
   ...
-}: {
+}: let
+  gnomeExtensions = with pkgs.gnomeExtensions; [
+    appindicator
+    bluetooth-quick-connect
+    blur-my-shell
+    caffeine
+    clipboard-indicator
+    dash-to-dock
+    grand-theft-focus
+    notification-banner-reloaded
+    quick-settings-tweaker
+    tailscale-status
+    tray-icons-reloaded
+  ];
+in {
   imports = [./hardware.nix];
 
   hardware.opengl.enable = true;
@@ -124,60 +138,50 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs;
-    android-tools
+    [
-    bitwarden
+      android-tools
-    cryptsetup
+      bitwarden
-    deja-dup
+      cryptsetup
-    discord
+      deja-dup
-    docker
+      discord
-    docker-compose
+      docker
-    foliate
+      docker-compose
-    ghostscript
+      foliate
-    gimp-with-plugins
+      ghostscript
-    glibcLocales
+      gimp-with-plugins
-    gnome.gnome-tweaks
+      glibcLocales
-    gnomeExtensions.appindicator
+      gnome.gnome-tweaks
-    gnomeExtensions.bluetooth-quick-connect
+      iputils
-    gnomeExtensions.blur-my-shell
+      kazam
-    gnomeExtensions.caffeine
+      legendary-gl
-    gnomeExtensions.clipboard-indicator
+      lm_sensors
-    gnomeExtensions.dash-to-dock
+      mullvad-vpn
-    gnomeExtensions.grand-theft-focus
+      netdata
-    gnomeExtensions.notification-banner-reloaded
+      nfs-utils
-    gnomeExtensions.quick-settings-tweaker
+      pavucontrol
-    gnomeExtensions.tailscale-status
+      pinentry-curses
-    gnomeExtensions.tray-icons-reloaded
+      podman
-    iputils
+      psst
-    kazam
+      qemu
-    legendary-gl
+      rustup
-    lm_sensors
+      ryujinx
-    mullvad-vpn
+      strace
-    netdata
+      tailscale
-    nfs-utils
+      traceroute
-    pavucontrol
+      ungoogled-chromium
-    pinentry-curses
+      unstable.logseq
-    podman
+      unstable.obsidian
-    podman-compose
+      unstable.signal-desktop
-    psst
+      unstable.yuzu
-    qemu
+      unstable.zoom-us
-    rustup
+      usbutils
-    ryujinx
+      virt-manager
-    signal-desktop
+      vlc
-    strace
+      whois
-    tailscale
+      wine
-    traceroute
+      wine64
-    ungoogled-chromium
+      wireshark-qt
-    unstable.logseq
+    ]
-    unstable.obsidian
+    ++ gnomeExtensions;
-    unstable.yuzu
-    unstable.zoom-us
-    usbutils
-    virt-manager
-    vlc
-    whois
-    wine
-    wine64
-    wireshark-qt
-  ];
 }

outputs.nix

@@ -19,9 +19,9 @@
     };
     defaultModules = [
       home-manager.nixosModules.home-manager
-      ./modules/fonts.nix
+      ./fonts.nix
-      ./modules/packages.nix
+      ./packages.nix
-      ./modules/upgrade-diff.nix
+      ./upgrade-diff.nix
 
       ({
         config,
@@ -53,7 +53,7 @@
           };
 
           nixpkgs.overlays = [
-            (import ./modules/overlays)
+            (import ./overlays)
           ];
 
           home-manager = {
@@ -71,15 +71,15 @@
       })
     ];
     desktopLinuxModules = [
-      ./modules/services/netdata/default.nix
+      ./services/netdata/default.nix
     ];
   in {
     hephaestus = nixpkgs.lib.nixosSystem {
       specialArgs = {inherit unstable;};
       modules =
         [
-          ./modules/machines/hephaestus/configuration.nix
+          ./machines/hephaestus/configuration.nix
-          ./modules/machines/hephaestus/hardware.nix
+          ./machines/hephaestus/hardware.nix
         ]
         ++ defaultModules
         ++ desktopLinuxModules;
@@ -98,15 +98,15 @@
 
       modules = [
         home-manager.darwinModules.home-manager
-        ./modules/darwin.nix
+        ./darwin.nix
-        ./modules/machines/zelus/configuration.nix
+        ./machines/zelus/configuration.nix
-        ./modules/packages.nix
+        ./packages.nix
-        ./modules/upgrade-diff.nix
+        ./upgrade-diff.nix
 
         ({config, ...}: {
           config = {
             nixpkgs.overlays = [
-              (import ./modules/overlays)
+              (import ./overlays)
             ];
             home-manager = {
               useGlobalPkgs = true;

packages.nix

@@ -24,6 +24,7 @@ in {
 
     # modern cli
     bat
+    doggo
     eza
     fd
     hadolint
@@ -58,7 +59,7 @@ in {
     unstable.azure-cli
     unstable.google-cloud-sdk
 
-    # LSP
+    # lsp
     nodePackages.bash-language-server
     nodePackages.pyright
     nodePackages.yaml-language-server
@@ -72,10 +73,6 @@ in {
     htop
     procs
 
-    # lua
-    lua53Packages.luacheck
-    stylua
-
     # golang
     gofumpt
     golangci-lint
@@ -97,6 +94,7 @@ in {
     openssl
     openvpn
     sshfs # mac requires https://osxfuse.github.io/
+    tcpdump
     vpngate
 
     # rice
@@ -111,16 +109,9 @@ in {
     nixfmt
     nixpkgs-fmt
     nixpkgs-review
-    rnix-lsp
 
     # python
     poetry
-    python310
+    python313
-    python310Packages.black
-    python310Packages.ipython
-    python310Packages.pip
-    python310Packages.poetry-core
-    python310Packages.setuptools
-    python310Packages.virtualenv
   ];
 }