refactor: removed legacy code, formatted code and improved own libraries

Wittano · Jan 13, 2024 · b82a6ce · b82a6ce
1 parent 38a656a
commit b82a6ce
Show file tree

Hide file tree

Showing 65 changed files with 797 additions and 996 deletions.
diff --git a/configuration.nix b/configuration.nix
@@ -1,12 +1,4 @@
-{ config
-, pkgs
-, unstable
-, lib
-, home-manager
-, username
-, isDevMode ? false
-, ownPackages
-, ...
+{ config, pkgs, unstable, lib, home-manager, isDevMode ? false, ownPackages, ...
 }: {
 
   # Nix configuration
@@ -87,14 +79,12 @@
   # Global packages
   environment = {
     systemPackages = with pkgs; [ vim htop direnv bash polkit_gnome ];
-    variables =
-      let projectConfigDir = "/home/wittano/projects/config";
-      in
-      {
-        EDITOR = "vim";
-        DOTFILES = "${projectConfigDir}/dotfiles";
-        NIX_DOTFILES = "${projectConfigDir}/nix-dotfiles";
-      };
+    variables = let projectConfigDir = "/home/wittano/projects/config";
+    in {
+      EDITOR = "vim";
+      DOTFILES = "${projectConfigDir}/dotfiles";
+      NIX_DOTFILES = "${projectConfigDir}/nix-dotfiles";
+    };
 
     shells = with pkgs; [ bash ];
   };
@@ -123,7 +113,7 @@
   hardware.trackpoint.emulateWheel = true;
 
   #User settings
-  users.users."${username}" = {
+  users.users.wittano = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
   };

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,40 +20,27 @@
     };
   };
 
-  outputs =
-    { self
-    , nixpkgs
-    , home-manager
-    , ...
-    }@inputs:
+  outputs = { self, nixpkgs, home-manager, ... }@inputs:
     let
       system = "x86_64-linux";
 
       lib = nixpkgs.lib.extend (sefl: super: {
         hm = home-manager.lib.hm;
-        my = import ./lib {
-          inherit lib system inputs;
-        };
+        my = import ./lib { inherit lib system inputs; };
       });
-    in
-    {
-      nixosConfigurations =
-        let
-          inherit (lib.attrsets) mapAttrs' nameValuePair;
-          inherit (lib.my.hosts) mkHost;
+    in {
+      nixosConfigurations = let
+        inherit (lib.attrsets) mapAttrs' nameValuePair;
+        inherit (lib.my.hosts) mkHost;
 
-          hosts = builtins.readDir ./hosts;
-          devHosts = mapAttrs'
-            (n: v:
-              let devName = "${n}-dev";
-              in
-              nameValuePair (devName) (mkHost {
-                name = devName;
-                isDevMode = true;
-              }))
-            hosts;
-          normalHosts = builtins.mapAttrs (n: v: mkHost { name = n; }) hosts;
-        in
-        normalHosts // devHosts;
+        hosts = builtins.readDir ./hosts;
+        devHosts = mapAttrs' (n: v:
+          let devName = "${n}-dev";
+          in nameValuePair (devName) (mkHost {
+            name = devName;
+            isDevMode = true;
+          })) hosts;
+        normalHosts = builtins.mapAttrs (n: v: mkHost { name = n; }) hosts;
+      in normalHosts // devHosts;
     };
 }
diff --git a/home/pc/default.nix b/home/pc/default.nix
@@ -26,8 +26,7 @@ let
     signal-desktop
     discord
   ];
-in
-{
+in {
   home = {
     username = "wittano";
     homeDirectory = "/home/wittano";

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
@@ -1,43 +1,39 @@
-{ config, pkgs, isDevMode ? false, username ? "wittano", ... }: {
+{ config, pkgs, isDevMode ? false, ... }: {
 
   imports = [ ./hardware.nix ./networking.nix ];
 
   home-manager.users.wittano = ./../../home/pc;
 
-  modules =
-    let
-      enableWithDevMode = {
+  modules = let
+    enableWithDevMode = {
+      enable = true;
+      enableDevMode = isDevMode;
+    };
+  in {
+    desktop = { qtile = enableWithDevMode; };
+    editors.neovim.enable = true;
+    dev = {
+      goland.enable = true;
+      clion.enable = true;
+    };
+    hardware = {
+      sound.enable = true;
+      grub.enable = true;
+      wifi.enable = true;
+      virtualization = {
         enable = true;
-        enableDevMode = isDevMode;
-      };
-    in
-    {
-      desktop = {
-        qtile = enableWithDevMode;
-      };
-      editors.neovim.enable = true;
-      dev = {
-        goland.enable = true;
-        clion.enable = true;
+        enableDocker = true;
       };
-      hardware = {
-        sound.enable = true;
-        grub.enable = true;
-        wifi.enable = true;
-        virtualization = {
-          enable = true;
-          enableDocker = true;
-        };
-        nvidia.enable = true;
-      };
-      services = {
-        backup = {
-          enable = true;
-          backupDir = "/mnt/backup/wittano.nixos";
-        };
-        syncthing.enable = true;
-        redshift.enable = true;
+      nvidia.enable = true;
+    };
+    services = {
+      backup = {
+        enable = true;
+        backupDir = "/mnt/backup/wittano.nixos";
       };
+      syncthing.enable = true;
+      redshift.enable = true;
     };
+  };
 
 }
diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, isDevMode ? false, username ? "wittano", ... }: {
+{ config, pkgs, isDevMode ? false, ... }: {
 
   imports = [ ./hardware.nix ./networking.nix ];
 
@@ -24,44 +24,42 @@
 
   programs.droidcam.enable = true;
 
-  modules =
-    let
-      enableWithDevMode = {
+  modules = let
+    enableWithDevMode = {
+      enable = true;
+      enableDevMode = isDevMode;
+    };
+  in {
+    desktop = {
+      qtile = enableWithDevMode;
+      gaming = {
         enable = true;
-        enableDevMode = isDevMode;
-      };
-    in
-    {
-      desktop = {
-        qtile = enableWithDevMode;
-        gaming = {
-          enable = true;
-          enableAdditionalDisk = true;
-          enableMihoyoGames = true;
-        };
-      };
-      dev.jvm.enable = true;
-      editors.neovim.enable = true;
-      hardware = {
-        sound.enable = true;
-        grub.enable = true;
-        wacom.enable = true;
-        virtualization.enable = true;
-        nvidia.enable = true;
-        bluetooth.enable = true;
+        enableAdditionalDisk = true;
+        enableMihoyoGames = true;
       };
-      services = {
-        boinc.enable = true;
-        backup = {
-          enable = true;
-          backupDir = "/mnt/backup/wittano.nixos";
-        };
-        ssh.enable = true;
-        syncthing.enable = true;
-        redshift.enable = true;
-        prometheus.enable = true;
-        filebot.enable = true;
+    };
+    dev.jvm.enable = true;
+    editors.neovim.enable = true;
+    hardware = {
+      sound.enable = true;
+      grub.enable = true;
+      wacom.enable = true;
+      virtualization.enable = true;
+      nvidia.enable = true;
+      bluetooth.enable = true;
+    };
+    services = {
+      boinc.enable = true;
+      backup = {
+        enable = true;
+        backupDir = "/mnt/backup/wittano.nixos";
       };
+      ssh.enable = true;
+      syncthing.enable = true;
+      redshift.enable = true;
+      prometheus.enable = true;
+      filebot.enable = true;
     };
+  };
 
 }
diff --git a/hosts/pc/hardware.nix b/hosts/pc/hardware.nix
@@ -13,7 +13,5 @@
       fsType = "ext4";
     };
   };
-  swapDevices = [{
-    device = "/dev/disk/by-label/SWAP";
-  }];
+  swapDevices = [{ device = "/dev/disk/by-label/SWAP"; }];
 }
diff --git a/hosts/pc/networking.nix b/hosts/pc/networking.nix
@@ -1,10 +1,9 @@
 { config, ... }: {
-  assertions = [
-    {
-      assertion = !config.networking.networkmanager.enable;
-      message = "NetworkManager cannot be enable, causes problem with spotify interent connection";
-    }
-  ];
+  assertions = [{
+    assertion = !config.networking.networkmanager.enable;
+    message =
+      "NetworkManager cannot be enable, causes problem with spotify interent connection";
+  }];
 
   networking = {
 

diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, isDevMode ? false, username ? "wittano", ... }: {
+{ config, pkgs, isDevMode ? false, ... }: {
 
   imports = [ ./hardware.nix ];
 
@@ -12,7 +12,7 @@
 
   security.rtkit.enable = true;
 
-  users.users."${username}" = {
+  users.users.wittano = {
     isNormalUser = true;
     description = "virt";
     extraGroups = [ "networkmanager" "wheel" ];

diff --git a/hosts/vm/hardware.nix b/hosts/vm/hardware.nix
@@ -1,14 +1,13 @@
-{ config, lib, modulesPath, username ? "wittano", ... }: {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+{ config, lib, modulesPath, ... }: {
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   boot = {
     initrd.availableKernelModules = [ "virtio_pci" "virtio_blk" ];
     loader.systemd-boot.enable = true;
   };
 
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   networking = {
     networkmanager.enable = true;
@@ -27,7 +26,7 @@
     # This mounting works only for KVM virtualization.
     # Before start VM, you have to add a Filesystem to your virutal machine.
     # I didn't test this configuration on other hypervisor like e.g. Virutalbox, so I don't know it's will be worked
-    "/home/${username}/projects/config/nix-dotfiles" = {
+    "/home/wittano/projects/config/nix-dotfiles" = {
       device = "/share";
       fsType = "9p";
     };

diff --git a/lib/apps.nix b/lib/apps.nix
@@ -1,5 +1,15 @@
 { lib, pkgs, dotfiles, home-manager, ownPackages, unstable, ... }: {
-  importApp = cfg: name:
-    import (./../modules/desktop/apps + "/${name}.nix") { inherit cfg pkgs lib dotfiles home-manager ownPackages unstable; };
+  desktopApps = config: cfg:
+    let
+      sourceDir = ./../modules/desktop/apps;
+      appFiles = lib.attrsets.filterAttrs
+        (n: v: ((lib.strings.hasSuffix ".nix" n) && v == "regular"))
+        (builtins.readDir sourceDir);
+    in lib.attrsets.mapAttrs' (n: v: {
+      name = builtins.replaceStrings [ ".nix" ] [ "" ] n;
+      value = import "${sourceDir}/${n}" {
+        inherit cfg ownPackages pkgs dotfiles home-manager unstable config lib;
+      };
+    }) appFiles;
 }