From 2a5983344d133faccbcfd4a09b29a1a4cb0b5317 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 14 May 2023 23:40:45 +0200 Subject: [PATCH 1/6] WIP: move nixos modules --- flake.nix | 154 +++++------------- modules/nixos/basics/default.nix | 10 ++ .../nixos/basics}/distributed.nix | 0 .../nixos/basics}/extended-registry.nix | 0 .../nixos/basics}/remote-deploy.nix | 0 .../nixos/basics}/zerotier.nix | 0 {nixos_modules => modules/nixos}/big_data.nix | 0 {nixos_modules => modules/nixos}/defcon.nix | 0 .../nixos}/digitalocean.nix | 0 {nixos_modules => modules/nixos}/dnsmasq.nix | 0 {nixos_modules => modules/nixos}/garage.nix | 2 +- .../nixos}/installer.nix | 0 {nixos_modules => modules/nixos}/k3s.nix | 0 .../nixos}/kdeconnect.nix | 0 {nixos_modules => modules/nixos}/mind.nix | 0 .../nixos}/nextcloud.nix | 4 +- .../nixos}/nix-serve.nix | 0 .../nixos}/pentablet.nix | 0 .../nixos}/pro_audio.nix | 0 .../server}/automatic-garbage-collection.nix | 0 .../nixos/server}/automatic-upgrade.nix | 0 .../nixos/server}/btrfs-scrub.nix | 0 modules/nixos/server/default.nix | 10 ++ .../nixos/server}/fstrim.nix | 0 .../nixos/server}/fwupd.nix | 0 {nixos_modules => modules/nixos}/sesar.nix | 0 .../nixos}/steam-link.nix | 0 .../nixos}/tailscale.nix | 0 .../nixos/users/bertof.nix | 0 29 files changed, 65 insertions(+), 115 deletions(-) create mode 100644 modules/nixos/basics/default.nix rename {nixos_modules => modules/nixos/basics}/distributed.nix (100%) rename {nixos_modules => modules/nixos/basics}/extended-registry.nix (100%) rename {nixos_modules => modules/nixos/basics}/remote-deploy.nix (100%) rename {nixos_modules => modules/nixos/basics}/zerotier.nix (100%) rename {nixos_modules => modules/nixos}/big_data.nix (100%) rename {nixos_modules => modules/nixos}/defcon.nix (100%) rename {nixos_modules => modules/nixos}/digitalocean.nix (100%) rename {nixos_modules => modules/nixos}/dnsmasq.nix (100%) rename {nixos_modules => modules/nixos}/garage.nix (92%) rename {nixos_modules => modules/nixos}/installer.nix (100%) rename {nixos_modules => modules/nixos}/k3s.nix (100%) rename {nixos_modules => modules/nixos}/kdeconnect.nix (100%) rename {nixos_modules => modules/nixos}/mind.nix (100%) rename {nixos_modules => modules/nixos}/nextcloud.nix (83%) rename {nixos_modules => modules/nixos}/nix-serve.nix (100%) rename {nixos_modules => modules/nixos}/pentablet.nix (100%) rename {nixos_modules => modules/nixos}/pro_audio.nix (100%) rename {nixos_modules => modules/nixos/server}/automatic-garbage-collection.nix (100%) rename {nixos_modules => modules/nixos/server}/automatic-upgrade.nix (100%) rename {nixos_modules => modules/nixos/server}/btrfs-scrub.nix (100%) create mode 100644 modules/nixos/server/default.nix rename {nixos_modules => modules/nixos/server}/fstrim.nix (100%) rename {nixos_modules => modules/nixos/server}/fwupd.nix (100%) rename {nixos_modules => modules/nixos}/sesar.nix (100%) rename {nixos_modules => modules/nixos}/steam-link.nix (100%) rename {nixos_modules => modules/nixos}/tailscale.nix (100%) rename nixos_modules/bertof_user.nix => modules/nixos/users/bertof.nix (100%) diff --git a/flake.nix b/flake.nix index b177522..fa5a324 100644 --- a/flake.nix +++ b/flake.nix @@ -53,11 +53,7 @@ checks = { pre-commit-check = pre-commit-hooks.lib.${system}.run { src = ./.; - hooks = { - deadnix.enable = true; - nixpkgs-fmt.enable = true; - statix.enable = true; - }; + hooks = { deadnix.enable = true; nixpkgs-fmt.enable = true; statix.enable = true; }; }; }; @@ -110,48 +106,31 @@ age.secrets.thor_wg_priv = { file = ./secrets/thor_wg_priv.age; }; } - ./nixos_modules/bertof_user.nix + ./modules/nixos/users/bertof.nix - # Some defaults - ./nixos_modules/fwupd.nix - ./nixos_modules/fstrim.nix - ./nixos_modules/btrfs-scrub.nix - ./nixos_modules/distributed.nix - ./nixos_modules/remote-deploy.nix - ./nixos_modules/extended-registry.nix - ./nixos_modules/automatic-garbage-collection.nix - ./nixos_modules/automatic-upgrade.nix - ./nixos_modules/zerotier.nix + # Some basic defaults + ./modules/nixos/basics ]; - installerModules = [ - # Nix configuration - nix_configuration - - ./nixos_modules/bertof_user.nix - - ./nixos_modules/distributed.nix - ./nixos_modules/remote-deploy.nix - ./nixos_modules/extended-registry.nix - ./nixos_modules/zerotier.nix - ./nixos_modules/installer.nix - ]; + installerModules = commonModules ++ [ ./modules/nixos/installer.nix ]; thorConfig = { nixosConfigurations = { thor = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ [ + ./modules/nixos/server + ./thor/hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-pc-ssd ./thor/configuration.nix - ./nixos_modules/pro_audio.nix - ./nixos_modules/sesar.nix - ./nixos_modules/pentablet.nix - ./nixos_modules/steam-link.nix - ./nixos_modules/kdeconnect.nix + ./modules/nixos/pro_audio.nix + ./modules/nixos/sesar.nix + ./modules/nixos/pentablet.nix + ./modules/nixos/steam-link.nix + ./modules/nixos/kdeconnect.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./thor/hm.nix; } ]; @@ -163,18 +142,19 @@ nixosConfigurations = let odinCommonModules = [ + ./modules/nixos/laptop + nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop-ssd ./odin/hardware-configuration.nix ./odin/common_configuration.nix - ./nixos_modules/pro_audio.nix - ./nixos_modules/sesar.nix - ./nixos_modules/pentablet.nix - ./nixos_modules/steam-link.nix - ./nixos_modules/kdeconnect.nix - ./nixos_modules/garage.nix + ./modules/nixos/pro_audio.nix + ./modules/nixos/sesar.nix + ./modules/nixos/pentablet.nix + ./modules/nixos/steam-link.nix + ./modules/nixos/kdeconnect.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./odin/hm.nix; } ]; @@ -205,12 +185,13 @@ ({ lib, ... }: { boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ]; }) + ./modules/nixos/server ./freya/hardware-configuration.nix ./freya/configuration.nix - ./nixos_modules/garage.nix - ./nixos_modules/nextcloud.nix + ./modules/nixos/garage.nix + ./modules/nixos/nextcloud.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./freya/hm.nix; } ]; @@ -223,11 +204,12 @@ baldur = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ [ + ./modules/nixos/server # ./baldur/hardware-configuration.nix ./baldur/configuration.nix "${nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix" - ./nixos_modules/digitalocean.nix - ./nixos_modules/garage.nix + ./modules/nixos/digitalocean.nix + ./modules/nixos/garage.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./baldur/hm.nix; } ]; @@ -240,6 +222,8 @@ loki = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ [ + ./modules/nixos/server + nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-ssd ./loki/hardware-configuration.nix @@ -264,78 +248,24 @@ # Map nodes to Deploy-rs deployments deploy.nodes = { - thor = { - hostname = "thor.local"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.thor; - }; - }; - - odin = { - hostname = "odin.local"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.odin; - }; - }; - - loki = { - hostname = "loki.local"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.loki; - }; - }; - - baldur = { - hostname = "baldur.bertof.net"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.baldur; - }; - }; - - freya = { - hostname = "freya.local"; - profiles.system = { - user = "root"; - path = deploy-rs.lib.aarch64-linux.activate.nixos - self.nixosConfigurations.freya; - }; - }; + thor = { hostname = "thor.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; }; + odin = { hostname = "odin.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; }; + loki = { hostname = "loki.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; }; + baldur = { hostname = "baldur.bertof.net"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.baldur; }; }; + freya = { hostname = "freya.local"; profiles.system = { user = "root"; path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.freya; }; }; }; }; - images = with flake-utils.lib; - eachSystem [ system.x86_64-linux system.aarch64-linux ] (system: { - packages = { - # Installer ISO - install-iso = nixos-generators.nixosGenerate { - inherit system; - modules = installerModules; - format = "install-iso"; - }; - - # Aarch64 base image - aarch64-base-image = nixos-generators.nixosGenerate { - system = flake-utils.lib.system.aarch64-linux; - modules = installerModules; - format = "sd-aarch64"; - }; - - # Installer DigitalOcean - do-image = nixos-generators.nixosGenerate { - inherit system; - modules = installerModules; - format = "do"; - }; - }; - }); + images = with flake-utils.lib; eachSystem [ system.x86_64-linux system.aarch64-linux ] (system: { + packages = { + # Installer ISO + install-iso = nixos-generators.nixosGenerate { inherit system; modules = installerModules; format = "install-iso"; }; + # Aarch64 base image + aarch64-base-image = nixos-generators.nixosGenerate { system = flake-utils.lib.system.aarch64-linux; modules = installerModules; format = "sd-aarch64"; }; + # Installer DigitalOcean + do-image = nixos-generators.nixosGenerate { inherit system; modules = installerModules; format = "do"; }; + }; + }); in builtins.foldl' nixpkgs.lib.recursiveUpdate { } [ diff --git a/modules/nixos/basics/default.nix b/modules/nixos/basics/default.nix new file mode 100644 index 0000000..a4d3a59 --- /dev/null +++ b/modules/nixos/basics/default.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +let + src = ./.; + files = builtins.readDir src; + nixFiles = builtins.attrNames (lib.attrsets.filterAttrs (name: type: type != "directory" && lib.hasSuffix ".nix" name && !(lib.hasSuffix "default.nix" name)) files); + imports = builtins.map (path: src + ("/" + path)) nixFiles; +in +{ + inherit imports; +} diff --git a/nixos_modules/distributed.nix b/modules/nixos/basics/distributed.nix similarity index 100% rename from nixos_modules/distributed.nix rename to modules/nixos/basics/distributed.nix diff --git a/nixos_modules/extended-registry.nix b/modules/nixos/basics/extended-registry.nix similarity index 100% rename from nixos_modules/extended-registry.nix rename to modules/nixos/basics/extended-registry.nix diff --git a/nixos_modules/remote-deploy.nix b/modules/nixos/basics/remote-deploy.nix similarity index 100% rename from nixos_modules/remote-deploy.nix rename to modules/nixos/basics/remote-deploy.nix diff --git a/nixos_modules/zerotier.nix b/modules/nixos/basics/zerotier.nix similarity index 100% rename from nixos_modules/zerotier.nix rename to modules/nixos/basics/zerotier.nix diff --git a/nixos_modules/big_data.nix b/modules/nixos/big_data.nix similarity index 100% rename from nixos_modules/big_data.nix rename to modules/nixos/big_data.nix diff --git a/nixos_modules/defcon.nix b/modules/nixos/defcon.nix similarity index 100% rename from nixos_modules/defcon.nix rename to modules/nixos/defcon.nix diff --git a/nixos_modules/digitalocean.nix b/modules/nixos/digitalocean.nix similarity index 100% rename from nixos_modules/digitalocean.nix rename to modules/nixos/digitalocean.nix diff --git a/nixos_modules/dnsmasq.nix b/modules/nixos/dnsmasq.nix similarity index 100% rename from nixos_modules/dnsmasq.nix rename to modules/nixos/dnsmasq.nix diff --git a/nixos_modules/garage.nix b/modules/nixos/garage.nix similarity index 92% rename from nixos_modules/garage.nix rename to modules/nixos/garage.nix index 2cbdf69..947a6ac 100644 --- a/nixos_modules/garage.nix +++ b/modules/nixos/garage.nix @@ -1,7 +1,7 @@ { pkgs, config, lib, ... }: { users.groups.garage = { }; users.users.garage = { isSystemUser = true; group = "garage"; }; - age.secrets.garage_rpc_secret = { file = ../secrets/garage_rpc_secret.age; owner = "garage"; }; + age.secrets.garage_rpc_secret = { file = ../../secrets/garage_rpc_secret.age; owner = "garage"; }; networking.firewall.interfaces."ztmjfdwjkp".allowedTCPPorts = [ 3901 diff --git a/nixos_modules/installer.nix b/modules/nixos/installer.nix similarity index 100% rename from nixos_modules/installer.nix rename to modules/nixos/installer.nix diff --git a/nixos_modules/k3s.nix b/modules/nixos/k3s.nix similarity index 100% rename from nixos_modules/k3s.nix rename to modules/nixos/k3s.nix diff --git a/nixos_modules/kdeconnect.nix b/modules/nixos/kdeconnect.nix similarity index 100% rename from nixos_modules/kdeconnect.nix rename to modules/nixos/kdeconnect.nix diff --git a/nixos_modules/mind.nix b/modules/nixos/mind.nix similarity index 100% rename from nixos_modules/mind.nix rename to modules/nixos/mind.nix diff --git a/nixos_modules/nextcloud.nix b/modules/nixos/nextcloud.nix similarity index 83% rename from nixos_modules/nextcloud.nix rename to modules/nixos/nextcloud.nix index ebd2ddd..e8125b6 100644 --- a/nixos_modules/nextcloud.nix +++ b/modules/nixos/nextcloud.nix @@ -1,8 +1,8 @@ { pkgs, config, ... }: { age.secrets = { - nextcloud_admin_secret = { file = ../secrets/nextcloud_admin_secret.age; owner = "nextcloud"; }; - nextcloud_bucket_secret = { file = ../secrets/nextcloud_bucket_secret.age; owner = "nextcloud"; }; + nextcloud_admin_secret = { file = ../../secrets/nextcloud_admin_secret.age; owner = "nextcloud"; }; + nextcloud_bucket_secret = { file = ../../secrets/nextcloud_bucket_secret.age; owner = "nextcloud"; }; }; # services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { diff --git a/nixos_modules/nix-serve.nix b/modules/nixos/nix-serve.nix similarity index 100% rename from nixos_modules/nix-serve.nix rename to modules/nixos/nix-serve.nix diff --git a/nixos_modules/pentablet.nix b/modules/nixos/pentablet.nix similarity index 100% rename from nixos_modules/pentablet.nix rename to modules/nixos/pentablet.nix diff --git a/nixos_modules/pro_audio.nix b/modules/nixos/pro_audio.nix similarity index 100% rename from nixos_modules/pro_audio.nix rename to modules/nixos/pro_audio.nix diff --git a/nixos_modules/automatic-garbage-collection.nix b/modules/nixos/server/automatic-garbage-collection.nix similarity index 100% rename from nixos_modules/automatic-garbage-collection.nix rename to modules/nixos/server/automatic-garbage-collection.nix diff --git a/nixos_modules/automatic-upgrade.nix b/modules/nixos/server/automatic-upgrade.nix similarity index 100% rename from nixos_modules/automatic-upgrade.nix rename to modules/nixos/server/automatic-upgrade.nix diff --git a/nixos_modules/btrfs-scrub.nix b/modules/nixos/server/btrfs-scrub.nix similarity index 100% rename from nixos_modules/btrfs-scrub.nix rename to modules/nixos/server/btrfs-scrub.nix diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix new file mode 100644 index 0000000..a4d3a59 --- /dev/null +++ b/modules/nixos/server/default.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +let + src = ./.; + files = builtins.readDir src; + nixFiles = builtins.attrNames (lib.attrsets.filterAttrs (name: type: type != "directory" && lib.hasSuffix ".nix" name && !(lib.hasSuffix "default.nix" name)) files); + imports = builtins.map (path: src + ("/" + path)) nixFiles; +in +{ + inherit imports; +} diff --git a/nixos_modules/fstrim.nix b/modules/nixos/server/fstrim.nix similarity index 100% rename from nixos_modules/fstrim.nix rename to modules/nixos/server/fstrim.nix diff --git a/nixos_modules/fwupd.nix b/modules/nixos/server/fwupd.nix similarity index 100% rename from nixos_modules/fwupd.nix rename to modules/nixos/server/fwupd.nix diff --git a/nixos_modules/sesar.nix b/modules/nixos/sesar.nix similarity index 100% rename from nixos_modules/sesar.nix rename to modules/nixos/sesar.nix diff --git a/nixos_modules/steam-link.nix b/modules/nixos/steam-link.nix similarity index 100% rename from nixos_modules/steam-link.nix rename to modules/nixos/steam-link.nix diff --git a/nixos_modules/tailscale.nix b/modules/nixos/tailscale.nix similarity index 100% rename from nixos_modules/tailscale.nix rename to modules/nixos/tailscale.nix diff --git a/nixos_modules/bertof_user.nix b/modules/nixos/users/bertof.nix similarity index 100% rename from nixos_modules/bertof_user.nix rename to modules/nixos/users/bertof.nix From 5db76d0fed723cc34b7fb5bb1a45264e157771b5 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 19 Jul 2023 10:36:00 +0100 Subject: [PATCH 2/6] Odin: add garage --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fa5a324..bde0edd 100644 --- a/flake.nix +++ b/flake.nix @@ -142,7 +142,7 @@ nixosConfigurations = let odinCommonModules = [ - ./modules/nixos/laptop + ./modules/nixos/server nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-laptop @@ -155,6 +155,7 @@ ./modules/nixos/pentablet.nix ./modules/nixos/steam-link.nix ./modules/nixos/kdeconnect.nix + ./modules/nixos/garage.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./odin/hm.nix; } ]; From 3cf0004b789f88ad871e599456bf42b78f8a8924 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 19 Jul 2023 10:42:09 +0100 Subject: [PATCH 3/6] Move HM modules --- baldur/hm.nix | 28 +-- configs/kak/colors/nord.kak | 97 -------- configs/rofi/nord.rasi | 89 ------- configs/rofi/onedark.rasi | 101 -------- freya/hm.nix | 18 +- hm_modules/rofi.nix | 25 -- hm_modules/zellij.nix.orig | 66 ------ loki/hm.nix | 32 +-- loki/hm_tiziano.nix | 16 +- {hm_modules => modules/hm}/__basic.nix | 0 {hm_modules => modules/hm}/alacritty.nix | 0 {hm_modules => modules/hm}/autorandr.nix | 0 {hm_modules => modules/hm}/bash.nix | 0 {hm_modules => modules/hm}/bat.nix | 0 {hm_modules => modules/hm}/biblio.nix | 0 {hm_modules => modules/hm}/bitwarden.nix | 0 {hm_modules => modules/hm}/blender.nix | 0 {hm_modules => modules/hm}/blender_nvidia.nix | 0 {hm_modules => modules/hm}/bottom.nix | 0 {hm_modules => modules/hm}/broot.nix | 0 {hm_modules => modules/hm}/bspwm.nix | 0 {hm_modules => modules/hm}/cava.nix | 0 {hm_modules => modules/hm}/configurations.nix | 0 .../hm}/development/cpp.nix | 0 .../hm}/development/data.nix | 0 .../hm}/development/database.nix | 0 .../hm}/development/docker.nix | 0 {hm_modules => modules/hm}/development/go.nix | 0 .../hm}/development/javascript.nix | 0 .../hm}/development/kubernetes.nix | 0 .../hm}/development/latex.nix | 0 .../hm}/development/markdown.nix | 0 .../hm}/development/nix.nix | 0 .../hm}/development/python.nix | 0 .../hm}/development/rust.nix | 0 {hm_modules => modules/hm}/dircolors.nix | 0 {hm_modules => modules/hm}/direnv.nix | 0 {hm_modules => modules/hm}/dunst.nix | 0 {hm_modules => modules/hm}/dwarf-fortress.nix | 0 {hm_modules => modules/hm}/easyeffects.nix | 0 {hm_modules => modules/hm}/exa.nix | 0 {hm_modules => modules/hm}/firefox.nix | 0 {hm_modules => modules/hm}/fonts.nix | 0 {hm_modules => modules/hm}/fzf.nix | 0 {hm_modules => modules/hm}/git.nix | 0 {hm_modules => modules/hm}/gnome_shell.nix | 0 {hm_modules => modules/hm}/gpg.nix | 0 {hm_modules => modules/hm}/grobi.nix | 0 {hm_modules => modules/hm}/gtk_theme.nix | 0 {hm_modules => modules/hm}/heif.nix | 0 {hm_modules => modules/hm}/helix.nix | 0 {hm_modules => modules/hm}/info.nix | 0 {hm_modules => modules/hm}/java.nix | 0 {hm_modules => modules/hm}/joystickwake.nix | 0 {hm_modules => modules/hm}/jq.nix | 0 {hm_modules => modules/hm}/kakoune.nix | 0 {hm_modules => modules/hm}/kdeconnect.nix | 0 {hm_modules => modules/hm}/keepassxc.nix | 0 {hm_modules => modules/hm}/keychain.nix | 0 {hm_modules => modules/hm}/kicad.nix | 0 {hm_modules => modules/hm}/kitty.nix | 0 {hm_modules => modules/hm}/lf.nix | 0 .../hm}/libinput-gestures.nix | 0 {hm_modules => modules/hm}/lorri.nix | 0 {hm_modules => modules/hm}/lsd.nix | 0 {hm_modules => modules/hm}/lutris.nix | 0 {hm_modules => modules/hm}/man.nix | 0 {hm_modules => modules/hm}/mangohud.nix | 0 {hm_modules => modules/hm}/megasync.nix | 0 {hm_modules => modules/hm}/mpv.nix | 0 {hm_modules => modules/hm}/nautilus.nix | 0 {hm_modules => modules/hm}/ncspot.nix | 0 {hm_modules => modules/hm}/nemo.nix | 0 {hm_modules => modules/hm}/nix-index.nix | 0 {hm_modules => modules/hm}/noti.nix | 0 {hm_modules => modules/hm}/nushell.nix | 0 {hm_modules => modules/hm}/obs-studio.nix | 0 {hm_modules => modules/hm}/office.nix | 0 {hm_modules => modules/hm}/onedrive.nix | 0 {hm_modules => modules/hm}/pass.nix | 0 {hm_modules => modules/hm}/picom.nix | 0 {hm_modules => modules/hm}/polybar.nix | 0 {hm_modules => modules/hm}/pro_audio.nix | 0 {hm_modules => modules/hm}/pycharm.nix | 0 {hm_modules => modules/hm}/research.nix | 0 modules/hm/rofi.nix | 217 ++++++++++++++++++ {hm_modules => modules/hm}/screen_locker.nix | 0 {hm_modules => modules/hm}/security.nix | 0 {hm_modules => modules/hm}/shell_aliases.nix | 0 {hm_modules => modules/hm}/spotifyd.nix | 0 {hm_modules => modules/hm}/ssh.nix | 0 {hm_modules => modules/hm}/starship.nix | 0 {hm_modules => modules/hm}/sxhkd.nix | 0 {hm_modules => modules/hm}/syncthing.nix | 0 .../hm}/syncthing_tiziano.nix | 0 {hm_modules => modules/hm}/terminator.nix | 0 {hm_modules => modules/hm}/thunar.nix | 0 {hm_modules => modules/hm}/tmux.nix | 0 {hm_modules => modules/hm}/twmn.nix | 0 .../hm}/update_background.nix | 0 {hm_modules => modules/hm}/vim.nix | 0 {hm_modules => modules/hm}/webapp.nix | 0 {hm_modules => modules/hm}/xidlehook.nix | 0 {hm_modules => modules/hm}/xresources.nix | 0 {hm_modules => modules/hm}/zathura.nix | 0 {hm_modules => modules/hm}/zellij.nix | 0 {hm_modules => modules/hm}/zoxide.nix | 0 {hm_modules => modules/hm}/zsh.nix | 0 odin/hm.nix | 140 +++++------ thor/hm.nix | 138 +++++------ 110 files changed, 403 insertions(+), 564 deletions(-) delete mode 100644 configs/kak/colors/nord.kak delete mode 100644 configs/rofi/nord.rasi delete mode 100644 configs/rofi/onedark.rasi delete mode 100644 hm_modules/rofi.nix delete mode 100644 hm_modules/zellij.nix.orig rename {hm_modules => modules/hm}/__basic.nix (100%) rename {hm_modules => modules/hm}/alacritty.nix (100%) rename {hm_modules => modules/hm}/autorandr.nix (100%) rename {hm_modules => modules/hm}/bash.nix (100%) rename {hm_modules => modules/hm}/bat.nix (100%) rename {hm_modules => modules/hm}/biblio.nix (100%) rename {hm_modules => modules/hm}/bitwarden.nix (100%) rename {hm_modules => modules/hm}/blender.nix (100%) rename {hm_modules => modules/hm}/blender_nvidia.nix (100%) rename {hm_modules => modules/hm}/bottom.nix (100%) rename {hm_modules => modules/hm}/broot.nix (100%) rename {hm_modules => modules/hm}/bspwm.nix (100%) rename {hm_modules => modules/hm}/cava.nix (100%) rename {hm_modules => modules/hm}/configurations.nix (100%) rename {hm_modules => modules/hm}/development/cpp.nix (100%) rename {hm_modules => modules/hm}/development/data.nix (100%) rename {hm_modules => modules/hm}/development/database.nix (100%) rename {hm_modules => modules/hm}/development/docker.nix (100%) rename {hm_modules => modules/hm}/development/go.nix (100%) rename {hm_modules => modules/hm}/development/javascript.nix (100%) rename {hm_modules => modules/hm}/development/kubernetes.nix (100%) rename {hm_modules => modules/hm}/development/latex.nix (100%) rename {hm_modules => modules/hm}/development/markdown.nix (100%) rename {hm_modules => modules/hm}/development/nix.nix (100%) rename {hm_modules => modules/hm}/development/python.nix (100%) rename {hm_modules => modules/hm}/development/rust.nix (100%) rename {hm_modules => modules/hm}/dircolors.nix (100%) rename {hm_modules => modules/hm}/direnv.nix (100%) rename {hm_modules => modules/hm}/dunst.nix (100%) rename {hm_modules => modules/hm}/dwarf-fortress.nix (100%) rename {hm_modules => modules/hm}/easyeffects.nix (100%) rename {hm_modules => modules/hm}/exa.nix (100%) rename {hm_modules => modules/hm}/firefox.nix (100%) rename {hm_modules => modules/hm}/fonts.nix (100%) rename {hm_modules => modules/hm}/fzf.nix (100%) rename {hm_modules => modules/hm}/git.nix (100%) rename {hm_modules => modules/hm}/gnome_shell.nix (100%) rename {hm_modules => modules/hm}/gpg.nix (100%) rename {hm_modules => modules/hm}/grobi.nix (100%) rename {hm_modules => modules/hm}/gtk_theme.nix (100%) rename {hm_modules => modules/hm}/heif.nix (100%) rename {hm_modules => modules/hm}/helix.nix (100%) rename {hm_modules => modules/hm}/info.nix (100%) rename {hm_modules => modules/hm}/java.nix (100%) rename {hm_modules => modules/hm}/joystickwake.nix (100%) rename {hm_modules => modules/hm}/jq.nix (100%) rename {hm_modules => modules/hm}/kakoune.nix (100%) rename {hm_modules => modules/hm}/kdeconnect.nix (100%) rename {hm_modules => modules/hm}/keepassxc.nix (100%) rename {hm_modules => modules/hm}/keychain.nix (100%) rename {hm_modules => modules/hm}/kicad.nix (100%) rename {hm_modules => modules/hm}/kitty.nix (100%) rename {hm_modules => modules/hm}/lf.nix (100%) rename {hm_modules => modules/hm}/libinput-gestures.nix (100%) rename {hm_modules => modules/hm}/lorri.nix (100%) rename {hm_modules => modules/hm}/lsd.nix (100%) rename {hm_modules => modules/hm}/lutris.nix (100%) rename {hm_modules => modules/hm}/man.nix (100%) rename {hm_modules => modules/hm}/mangohud.nix (100%) rename {hm_modules => modules/hm}/megasync.nix (100%) rename {hm_modules => modules/hm}/mpv.nix (100%) rename {hm_modules => modules/hm}/nautilus.nix (100%) rename {hm_modules => modules/hm}/ncspot.nix (100%) rename {hm_modules => modules/hm}/nemo.nix (100%) rename {hm_modules => modules/hm}/nix-index.nix (100%) rename {hm_modules => modules/hm}/noti.nix (100%) rename {hm_modules => modules/hm}/nushell.nix (100%) rename {hm_modules => modules/hm}/obs-studio.nix (100%) rename {hm_modules => modules/hm}/office.nix (100%) rename {hm_modules => modules/hm}/onedrive.nix (100%) rename {hm_modules => modules/hm}/pass.nix (100%) rename {hm_modules => modules/hm}/picom.nix (100%) rename {hm_modules => modules/hm}/polybar.nix (100%) rename {hm_modules => modules/hm}/pro_audio.nix (100%) rename {hm_modules => modules/hm}/pycharm.nix (100%) rename {hm_modules => modules/hm}/research.nix (100%) create mode 100644 modules/hm/rofi.nix rename {hm_modules => modules/hm}/screen_locker.nix (100%) rename {hm_modules => modules/hm}/security.nix (100%) rename {hm_modules => modules/hm}/shell_aliases.nix (100%) rename {hm_modules => modules/hm}/spotifyd.nix (100%) rename {hm_modules => modules/hm}/ssh.nix (100%) rename {hm_modules => modules/hm}/starship.nix (100%) rename {hm_modules => modules/hm}/sxhkd.nix (100%) rename {hm_modules => modules/hm}/syncthing.nix (100%) rename {hm_modules => modules/hm}/syncthing_tiziano.nix (100%) rename {hm_modules => modules/hm}/terminator.nix (100%) rename {hm_modules => modules/hm}/thunar.nix (100%) rename {hm_modules => modules/hm}/tmux.nix (100%) rename {hm_modules => modules/hm}/twmn.nix (100%) rename {hm_modules => modules/hm}/update_background.nix (100%) rename {hm_modules => modules/hm}/vim.nix (100%) rename {hm_modules => modules/hm}/webapp.nix (100%) rename {hm_modules => modules/hm}/xidlehook.nix (100%) rename {hm_modules => modules/hm}/xresources.nix (100%) rename {hm_modules => modules/hm}/zathura.nix (100%) rename {hm_modules => modules/hm}/zellij.nix (100%) rename {hm_modules => modules/hm}/zoxide.nix (100%) rename {hm_modules => modules/hm}/zsh.nix (100%) diff --git a/baldur/hm.nix b/baldur/hm.nix index 2d8400d..035835a 100644 --- a/baldur/hm.nix +++ b/baldur/hm.nix @@ -8,22 +8,22 @@ packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; }; }; imports = [ - ../hm_modules/__basic.nix + ../modules/hm/__basic.nix - # ../hm_modules/development/cpp.nix - # ../hm_modules/development/data.nix - # ../hm_modules/development/go.nix - # ../hm_modules/development/javascript.nix - # ../hm_modules/development/latex.nix - # ../hm_modules/development/python.nix - # ../hm_modules/development/rust.nix + # ../modules/hm/development/cpp.nix + # ../modules/hm/development/data.nix + # ../modules/hm/development/go.nix + # ../modules/hm/development/javascript.nix + # ../modules/hm/development/latex.nix + # ../modules/hm/development/python.nix + # ../modules/hm/development/rust.nix - # ../hm_modules/fonts.nix - ../hm_modules/helix.nix - # ../hm_modules/kitty.nix - # ../hm_modules/lf.nix - # ../hm_modules/megasync.nix - # ../hm_modules/noti.nix + # ../modules/hm/fonts.nix + ../modules/hm/helix.nix + # ../modules/hm/kitty.nix + # ../modules/hm/lf.nix + # ../modules/hm/megasync.nix + # ../modules/hm/noti.nix ]; home.stateVersion = "22.05"; diff --git a/configs/kak/colors/nord.kak b/configs/kak/colors/nord.kak deleted file mode 100644 index cb97cd4..0000000 --- a/configs/kak/colors/nord.kak +++ /dev/null @@ -1,97 +0,0 @@ -# text -# set-face global title rgb:bac5d8,default+b -# set-face global header rgb:e6e6e6,default -# set-face global bold rgb:e6e6e6,default+b -# set-face global italic rgb:d6d6d6,default+i -# set-face global mono rgb:b8b8b8,rgb:1f1f1f -# set-face global block rgb:b8b8b8,rgb:1f1f1f -# set-face global link rgb:e6e6e6,default -# set-face global bullet rgb:e6e6e6,default -# set-face global list rgb:c7c7c7,default - -set-face global value rgb:b48ead,default -set-face global type rgb:8fbcbb,default -set-face global identifier rgb:88c0d0,default -set-face global string rgb:a3be8c,default -set-face global error rgb:BF616A,default -set-face global keyword rgb:81a1c1,default -set-face global operator rgb:c7c7c7,default -set-face global attribute rgb:5e81ac,default -set-face global comment rgb:4c566a,default -set-face global meta rgb:ebcb8b,default - -set-face global Default rgb:eceff4,rgb:2e3440 - # default colors - -set-face global PrimarySelection rgb:2e3440,rgb:e5e9f0 - # main selection face for every selected character except the cursor - -set-face global SecondarySelection rgb:eceff4,rgb:434c5e - # secondary selection face for every selected character except the cursor - -set-face global PrimaryCursor rgb:2e3440,rgb:ebcb8b - # cursor of the primary selection - -set-face global SecondaryCursor rgb:2e3440,rgb:d8dee9 - # cursor of the secondary selection - -# set-face global PrimaryCursorEol - # cursor of the primary selection when it lies on and end of line character - -# set-face global SecondaryCursorEol - # cursor of the secondary selection when it lies on and end of line character - -set-face global MenuForeground rgb:d8dee9,rgb:4c566a - # face for the selected element in menus - -set-face global MenuBackground default,rgb:3b4252 - # face for the not selected elements in menus - -set-face global MenuInfo default,rgb:3b4252 - # face for additional information for elements in menus - -set-face global Information rgb:2e3440,rgb:88c0d0 - # face for the informations windows and information messages - -# set-face global Error - # face of error messages - -set-face global StatusLine rgb:e5e9f0,rgb:3b4252 - # face used for the status line - -set-face global StatusLineMode rgb:5e81ac,rgb:3b4252 - # face used for the current mode except the normal mode - -set-face global StatusLineInfo rgb:5e81ac,rgb:3b4252 - # face used for special information - -set-face global StatusLineValue rgb:5e81ac,rgb:3b4252 - # face used for special values (numeric prefixes, registers, etc.) - -set-face global StatusCursor rgb:2e3440,rgb:ebcb8b - # face used for the status line cursor - -set-face global Prompt rgb:88c0d0,rgb:3b4252 - # face used prompt displayed on the status line - -set-face global BufferPadding default,default - # face applied on the ~ characters that follow the last line of a buffer - -# set-face global Builtin highlighters faces - -# The following faces are used by builtin highlighters if enabled. - -# set-face global LineNumbers - # face used by the number-lines highlighter - -# set-face global LineNumberCursor - # face used to highlight the line number of the main selection - -# set-face global LineNumbersWrapped - # face used to highlight the line number of wrapped lines - -# set-face global MatchingChar - # face used by the show-matching highlighter - -# set-face global Whitespace - # face used by the show-whitespaces highlighter diff --git a/configs/rofi/nord.rasi b/configs/rofi/nord.rasi deleted file mode 100644 index 45b3413..0000000 --- a/configs/rofi/nord.rasi +++ /dev/null @@ -1,89 +0,0 @@ -* { - nord0: #2e3440; - nord1: #3b4252; - nord2: #434c5e; - nord3: #4c566a; - nord4: #d8dee9; - nord5: #e5e9f0; - nord6: #eceff4; - nord7: #8fbcbb; - nord8: #88c0d0; - nord9: #81a1c1; - nord10: #5e81ac; - nord11: #bf616a; - nord12: #d08770; - nord13: #ebcb8b; - nord14: #a3be8c; - nord15: #b48ead; - - background-color: @nord1; - border: 0px; - margin: 0px; - padding: 0px; - spacing: 0px; - text-color: @nord4; -} -#inputbar { - text-color: @nord3; - padding: 6px; - margin: 0px 0px 2px; - children: [ entry ]; -} -#entry { - background-color: @nord3; - text-color: @nord4; - padding: 5px; -} -#message { - border: 0px 0px 1px; - border-color: @nord3; - padding: 0px 0px 6px 7px; -} -#listview { - lines: 10; - padding: 2px 0px 0px; - scrollbar: true; -} -#element { - padding: 0px 0px 0px 7px; - margin: 0px 0px 5px 0px; - text-color: @nord4; -} -#element.normal.normal { - text-color: @nord4; -} -#element.normal.urgent { - text-color: @nord11; -} -#element.normal.active { - text-color: @nord10; -} -#element.alternate.normal { - text-color: @nord4; -} -#element.alternate.urgent { - text-color: @nord11; -} -#element.alternate.active { - text-color: @nord10; -} -#element.selected.normal { - background-color: @nord8; - text-color: @nord1; -} -#element.selected.urgent { - background-color: @nord11; - text-color: @nord4; -} -#element.selected.active { - background-color: @nord10; - text-color: @nord4; -} -#scrollbar { - handle-color: @nord3; - handle-width: 0.50em; -} -#button.selected { - background-color: @nord8; - text-color: @nord4; -} diff --git a/configs/rofi/onedark.rasi b/configs/rofi/onedark.rasi deleted file mode 100644 index 535e948..0000000 --- a/configs/rofi/onedark.rasi +++ /dev/null @@ -1,101 +0,0 @@ -/* - * ROFI One Dark - * - * Based on OneDark.vim (https://github.com/joshdick/onedark.vim) - * - * Author: Benjamin Stauss - * User: me-benni - * - */ - - -* { - black: #000000; - red: #eb6e67; - green: #95ee8f; - yellow: #f8c456; - blue: #6eaafb; - mangenta: #d886f3; - cyan: #6cdcf7; - purple: #C678DF; - emphasis: #50536b; - text: #dfdfdf; - text-alt: #b2b2b2; - fg: #abb2bf; - bg: #282c34; - - spacing: 0; - background-color: transparent; - - font: "Knack Nerd Font 14"; - text-color: @text; -} - -window { - transparency: "real"; - fullscreen: true; - background-color: #282c34dd; -} - -mainbox { - padding: 30% 30%; -} - -inputbar { - margin: 0px 0px 20px 0px; - children: [prompt, textbox-prompt-colon, entry, case-indicator]; -} - -prompt { - text-color: @blue; -} - -textbox-prompt-colon { - expand: false; - str: ":"; - text-color: @text-alt; -} - -entry { - margin: 0px 10px; -} - -listview { - spacing: 5px; - dynamic: true; - scrollbar: false; -} - -element { - padding: 5px; - text-color: @text-alt; - highlight: bold #95ee8f; /* green */ - border-radius: 3px; -} - -element selected { - background-color: @emphasis; - text-color: @text; -} - -element urgent, element selected urgent { - text-color: @red; -} - -element active, element selected active { - text-color: @purple; -} - -message { - padding: 5px; - border-radius: 3px; - background-color: @emphasis; - border: 1px; - border-color: @cyan; -} - -button selected { - padding: 5px; - border-radius: 3px; - background-color: @emphasis; -} \ No newline at end of file diff --git a/freya/hm.nix b/freya/hm.nix index 90f8655..a726f36 100644 --- a/freya/hm.nix +++ b/freya/hm.nix @@ -11,16 +11,16 @@ }; }; imports = [ - ../hm_modules/__basic.nix + ../modules/hm/__basic.nix - ../hm_modules/cava.nix - ../hm_modules/dunst.nix - ../hm_modules/helix.nix - ../hm_modules/kitty.nix - ../hm_modules/lf.nix - ../hm_modules/spotifyd.nix - ../hm_modules/syncthing.nix - # ../hm_modules/xidlehook.nix + ../modules/hm/cava.nix + ../modules/hm/dunst.nix + ../modules/hm/helix.nix + ../modules/hm/kitty.nix + ../modules/hm/lf.nix + ../modules/hm/spotifyd.nix + ../modules/hm/syncthing.nix + # ../modules/hm/xidlehook.nix ]; home.stateVersion = "22.11"; diff --git a/hm_modules/rofi.nix b/hm_modules/rofi.nix deleted file mode 100644 index fff9871..0000000 --- a/hm_modules/rofi.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: { - - home.packages = builtins.attrValues { - inherit (pkgs) - rofimoji - rofi-bluetooth - rofi-power-menu - rofi-vpn - xdotool - ; - }; - - programs.rofi = { - enable = true; - location = "center"; - font = "${pkgs.rice.font.monospace.name} ${toString pkgs.rice.font.monospace.size}"; - plugins = [ pkgs.rofi-calc ]; - extraConfig = { modi = "drun,run,ssh,window,calc"; }; - terminal = "alacritty"; - theme = "onedark"; - }; - - xdg.configFile."rofi/nord.rasi".source = ../configs/rofi/nord.rasi; - xdg.configFile."rofi/onedark.rasi".source = ../configs/rofi/onedark.rasi; -} diff --git a/hm_modules/zellij.nix.orig b/hm_modules/zellij.nix.orig deleted file mode 100644 index c60d9e1..0000000 --- a/hm_modules/zellij.nix.orig +++ /dev/null @@ -1,66 +0,0 @@ -<<<<<<< HEAD -{ pkgs, ... }: -let - strPalette = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.colorPalette; -in -{ - programs.zellij.enable = true; - - home.shellAliases."ze" = "zellij"; - - xdg.configFile."zellij/config.kdl".text = '' - theme "nix-rice" - pane_frames false - ''; - - xdg.configFile."zellij/themes/nix-rice.kdl".text = '' - themes { - nix-rice { - bg "${strPalette.primary.foreground}" - fg "${strPalette.primary.background}" - red "${strPalette.normal.red}" - black "${strPalette.normal.black}" - green "${strPalette.normal.green}" - yellow "${strPalette.normal.yellow}" - blue "${strPalette.normal.blue}" - magenta "${strPalette.normal.magenta}" - cyan "${strPalette.normal.cyan}" - white "${strPalette.normal.white}" - orange "${strPalette.bright.red}" - } - } - ''; -} -||||||| parent of 6c85a84 (Zellij) -======= -{ pkgs, ... }: -let - strPalette = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.colorPalette; -in -{ - programs.zellij.enable = true; - - xdg.configFile."zellij/config.kdl".text = '' - theme "nix-rice" - pane_frames false - ''; - - xdg.configFile."zellij/themes/nix-rice.kdl".text = '' - themes { - nix-rice { - bg "${strPalette.primary.foreground}" - fg "${strPalette.primary.background}" - red "${strPalette.normal.red}" - black "${strPalette.normal.black}" - green "${strPalette.normal.green}" - yellow "${strPalette.normal.yellow}" - blue "${strPalette.normal.blue}" - magenta "${strPalette.normal.magenta}" - cyan "${strPalette.normal.cyan}" - white "${strPalette.normal.white}" - orange "${strPalette.bright.red}" - } - } - ''; -} ->>>>>>> 6c85a84 (Zellij) diff --git a/loki/hm.nix b/loki/hm.nix index 3eb9493..a371a36 100644 --- a/loki/hm.nix +++ b/loki/hm.nix @@ -7,25 +7,25 @@ }; }; imports = [ - ../hm_modules/__basic.nix + ../modules/hm/__basic.nix - # ../hm_modules/development/cpp.nix - # ../hm_modules/development/data.nix - # ../hm_modules/development/go.nix - # ../hm_modules/development/javascript.nix - # ../hm_modules/development/latex.nix - # ../hm_modules/development/nix.nix - # ../hm_modules/development/python.nix - # ../hm_modules/development/rust.nix + # ../modules/hm/development/cpp.nix + # ../modules/hm/development/data.nix + # ../modules/hm/development/go.nix + # ../modules/hm/development/javascript.nix + # ../modules/hm/development/latex.nix + # ../modules/hm/development/nix.nix + # ../modules/hm/development/python.nix + # ../modules/hm/development/rust.nix - ../hm_modules/helix.nix - ../hm_modules/kakoune.nix - ../hm_modules/kitty.nix - ../hm_modules/lf.nix - ../hm_modules/megasync.nix - ../hm_modules/syncthing.nix + ../modules/hm/helix.nix + ../modules/hm/kakoune.nix + ../modules/hm/kitty.nix + ../modules/hm/lf.nix + ../modules/hm/megasync.nix + ../modules/hm/syncthing.nix - ../hm_modules/shell_aliases.nix + ../modules/hm/shell_aliases.nix ]; home.stateVersion = "22.11"; diff --git a/loki/hm_tiziano.nix b/loki/hm_tiziano.nix index d956b9c..750bfb6 100644 --- a/loki/hm_tiziano.nix +++ b/loki/hm_tiziano.nix @@ -7,16 +7,16 @@ }; }; imports = [ - ../hm_modules/__basic.nix + ../modules/hm/__basic.nix - ../hm_modules/helix.nix - ../hm_modules/kakoune.nix - ../hm_modules/kitty.nix - ../hm_modules/lf.nix - ../hm_modules/megasync.nix - ../hm_modules/syncthing_tiziano.nix + ../modules/hm/helix.nix + ../modules/hm/kakoune.nix + ../modules/hm/kitty.nix + ../modules/hm/lf.nix + ../modules/hm/megasync.nix + ../modules/hm/syncthing_tiziano.nix - ../hm_modules/shell_aliases.nix + ../modules/hm/shell_aliases.nix ]; home.stateVersion = "21.11"; diff --git a/hm_modules/__basic.nix b/modules/hm/__basic.nix similarity index 100% rename from hm_modules/__basic.nix rename to modules/hm/__basic.nix diff --git a/hm_modules/alacritty.nix b/modules/hm/alacritty.nix similarity index 100% rename from hm_modules/alacritty.nix rename to modules/hm/alacritty.nix diff --git a/hm_modules/autorandr.nix b/modules/hm/autorandr.nix similarity index 100% rename from hm_modules/autorandr.nix rename to modules/hm/autorandr.nix diff --git a/hm_modules/bash.nix b/modules/hm/bash.nix similarity index 100% rename from hm_modules/bash.nix rename to modules/hm/bash.nix diff --git a/hm_modules/bat.nix b/modules/hm/bat.nix similarity index 100% rename from hm_modules/bat.nix rename to modules/hm/bat.nix diff --git a/hm_modules/biblio.nix b/modules/hm/biblio.nix similarity index 100% rename from hm_modules/biblio.nix rename to modules/hm/biblio.nix diff --git a/hm_modules/bitwarden.nix b/modules/hm/bitwarden.nix similarity index 100% rename from hm_modules/bitwarden.nix rename to modules/hm/bitwarden.nix diff --git a/hm_modules/blender.nix b/modules/hm/blender.nix similarity index 100% rename from hm_modules/blender.nix rename to modules/hm/blender.nix diff --git a/hm_modules/blender_nvidia.nix b/modules/hm/blender_nvidia.nix similarity index 100% rename from hm_modules/blender_nvidia.nix rename to modules/hm/blender_nvidia.nix diff --git a/hm_modules/bottom.nix b/modules/hm/bottom.nix similarity index 100% rename from hm_modules/bottom.nix rename to modules/hm/bottom.nix diff --git a/hm_modules/broot.nix b/modules/hm/broot.nix similarity index 100% rename from hm_modules/broot.nix rename to modules/hm/broot.nix diff --git a/hm_modules/bspwm.nix b/modules/hm/bspwm.nix similarity index 100% rename from hm_modules/bspwm.nix rename to modules/hm/bspwm.nix diff --git a/hm_modules/cava.nix b/modules/hm/cava.nix similarity index 100% rename from hm_modules/cava.nix rename to modules/hm/cava.nix diff --git a/hm_modules/configurations.nix b/modules/hm/configurations.nix similarity index 100% rename from hm_modules/configurations.nix rename to modules/hm/configurations.nix diff --git a/hm_modules/development/cpp.nix b/modules/hm/development/cpp.nix similarity index 100% rename from hm_modules/development/cpp.nix rename to modules/hm/development/cpp.nix diff --git a/hm_modules/development/data.nix b/modules/hm/development/data.nix similarity index 100% rename from hm_modules/development/data.nix rename to modules/hm/development/data.nix diff --git a/hm_modules/development/database.nix b/modules/hm/development/database.nix similarity index 100% rename from hm_modules/development/database.nix rename to modules/hm/development/database.nix diff --git a/hm_modules/development/docker.nix b/modules/hm/development/docker.nix similarity index 100% rename from hm_modules/development/docker.nix rename to modules/hm/development/docker.nix diff --git a/hm_modules/development/go.nix b/modules/hm/development/go.nix similarity index 100% rename from hm_modules/development/go.nix rename to modules/hm/development/go.nix diff --git a/hm_modules/development/javascript.nix b/modules/hm/development/javascript.nix similarity index 100% rename from hm_modules/development/javascript.nix rename to modules/hm/development/javascript.nix diff --git a/hm_modules/development/kubernetes.nix b/modules/hm/development/kubernetes.nix similarity index 100% rename from hm_modules/development/kubernetes.nix rename to modules/hm/development/kubernetes.nix diff --git a/hm_modules/development/latex.nix b/modules/hm/development/latex.nix similarity index 100% rename from hm_modules/development/latex.nix rename to modules/hm/development/latex.nix diff --git a/hm_modules/development/markdown.nix b/modules/hm/development/markdown.nix similarity index 100% rename from hm_modules/development/markdown.nix rename to modules/hm/development/markdown.nix diff --git a/hm_modules/development/nix.nix b/modules/hm/development/nix.nix similarity index 100% rename from hm_modules/development/nix.nix rename to modules/hm/development/nix.nix diff --git a/hm_modules/development/python.nix b/modules/hm/development/python.nix similarity index 100% rename from hm_modules/development/python.nix rename to modules/hm/development/python.nix diff --git a/hm_modules/development/rust.nix b/modules/hm/development/rust.nix similarity index 100% rename from hm_modules/development/rust.nix rename to modules/hm/development/rust.nix diff --git a/hm_modules/dircolors.nix b/modules/hm/dircolors.nix similarity index 100% rename from hm_modules/dircolors.nix rename to modules/hm/dircolors.nix diff --git a/hm_modules/direnv.nix b/modules/hm/direnv.nix similarity index 100% rename from hm_modules/direnv.nix rename to modules/hm/direnv.nix diff --git a/hm_modules/dunst.nix b/modules/hm/dunst.nix similarity index 100% rename from hm_modules/dunst.nix rename to modules/hm/dunst.nix diff --git a/hm_modules/dwarf-fortress.nix b/modules/hm/dwarf-fortress.nix similarity index 100% rename from hm_modules/dwarf-fortress.nix rename to modules/hm/dwarf-fortress.nix diff --git a/hm_modules/easyeffects.nix b/modules/hm/easyeffects.nix similarity index 100% rename from hm_modules/easyeffects.nix rename to modules/hm/easyeffects.nix diff --git a/hm_modules/exa.nix b/modules/hm/exa.nix similarity index 100% rename from hm_modules/exa.nix rename to modules/hm/exa.nix diff --git a/hm_modules/firefox.nix b/modules/hm/firefox.nix similarity index 100% rename from hm_modules/firefox.nix rename to modules/hm/firefox.nix diff --git a/hm_modules/fonts.nix b/modules/hm/fonts.nix similarity index 100% rename from hm_modules/fonts.nix rename to modules/hm/fonts.nix diff --git a/hm_modules/fzf.nix b/modules/hm/fzf.nix similarity index 100% rename from hm_modules/fzf.nix rename to modules/hm/fzf.nix diff --git a/hm_modules/git.nix b/modules/hm/git.nix similarity index 100% rename from hm_modules/git.nix rename to modules/hm/git.nix diff --git a/hm_modules/gnome_shell.nix b/modules/hm/gnome_shell.nix similarity index 100% rename from hm_modules/gnome_shell.nix rename to modules/hm/gnome_shell.nix diff --git a/hm_modules/gpg.nix b/modules/hm/gpg.nix similarity index 100% rename from hm_modules/gpg.nix rename to modules/hm/gpg.nix diff --git a/hm_modules/grobi.nix b/modules/hm/grobi.nix similarity index 100% rename from hm_modules/grobi.nix rename to modules/hm/grobi.nix diff --git a/hm_modules/gtk_theme.nix b/modules/hm/gtk_theme.nix similarity index 100% rename from hm_modules/gtk_theme.nix rename to modules/hm/gtk_theme.nix diff --git a/hm_modules/heif.nix b/modules/hm/heif.nix similarity index 100% rename from hm_modules/heif.nix rename to modules/hm/heif.nix diff --git a/hm_modules/helix.nix b/modules/hm/helix.nix similarity index 100% rename from hm_modules/helix.nix rename to modules/hm/helix.nix diff --git a/hm_modules/info.nix b/modules/hm/info.nix similarity index 100% rename from hm_modules/info.nix rename to modules/hm/info.nix diff --git a/hm_modules/java.nix b/modules/hm/java.nix similarity index 100% rename from hm_modules/java.nix rename to modules/hm/java.nix diff --git a/hm_modules/joystickwake.nix b/modules/hm/joystickwake.nix similarity index 100% rename from hm_modules/joystickwake.nix rename to modules/hm/joystickwake.nix diff --git a/hm_modules/jq.nix b/modules/hm/jq.nix similarity index 100% rename from hm_modules/jq.nix rename to modules/hm/jq.nix diff --git a/hm_modules/kakoune.nix b/modules/hm/kakoune.nix similarity index 100% rename from hm_modules/kakoune.nix rename to modules/hm/kakoune.nix diff --git a/hm_modules/kdeconnect.nix b/modules/hm/kdeconnect.nix similarity index 100% rename from hm_modules/kdeconnect.nix rename to modules/hm/kdeconnect.nix diff --git a/hm_modules/keepassxc.nix b/modules/hm/keepassxc.nix similarity index 100% rename from hm_modules/keepassxc.nix rename to modules/hm/keepassxc.nix diff --git a/hm_modules/keychain.nix b/modules/hm/keychain.nix similarity index 100% rename from hm_modules/keychain.nix rename to modules/hm/keychain.nix diff --git a/hm_modules/kicad.nix b/modules/hm/kicad.nix similarity index 100% rename from hm_modules/kicad.nix rename to modules/hm/kicad.nix diff --git a/hm_modules/kitty.nix b/modules/hm/kitty.nix similarity index 100% rename from hm_modules/kitty.nix rename to modules/hm/kitty.nix diff --git a/hm_modules/lf.nix b/modules/hm/lf.nix similarity index 100% rename from hm_modules/lf.nix rename to modules/hm/lf.nix diff --git a/hm_modules/libinput-gestures.nix b/modules/hm/libinput-gestures.nix similarity index 100% rename from hm_modules/libinput-gestures.nix rename to modules/hm/libinput-gestures.nix diff --git a/hm_modules/lorri.nix b/modules/hm/lorri.nix similarity index 100% rename from hm_modules/lorri.nix rename to modules/hm/lorri.nix diff --git a/hm_modules/lsd.nix b/modules/hm/lsd.nix similarity index 100% rename from hm_modules/lsd.nix rename to modules/hm/lsd.nix diff --git a/hm_modules/lutris.nix b/modules/hm/lutris.nix similarity index 100% rename from hm_modules/lutris.nix rename to modules/hm/lutris.nix diff --git a/hm_modules/man.nix b/modules/hm/man.nix similarity index 100% rename from hm_modules/man.nix rename to modules/hm/man.nix diff --git a/hm_modules/mangohud.nix b/modules/hm/mangohud.nix similarity index 100% rename from hm_modules/mangohud.nix rename to modules/hm/mangohud.nix diff --git a/hm_modules/megasync.nix b/modules/hm/megasync.nix similarity index 100% rename from hm_modules/megasync.nix rename to modules/hm/megasync.nix diff --git a/hm_modules/mpv.nix b/modules/hm/mpv.nix similarity index 100% rename from hm_modules/mpv.nix rename to modules/hm/mpv.nix diff --git a/hm_modules/nautilus.nix b/modules/hm/nautilus.nix similarity index 100% rename from hm_modules/nautilus.nix rename to modules/hm/nautilus.nix diff --git a/hm_modules/ncspot.nix b/modules/hm/ncspot.nix similarity index 100% rename from hm_modules/ncspot.nix rename to modules/hm/ncspot.nix diff --git a/hm_modules/nemo.nix b/modules/hm/nemo.nix similarity index 100% rename from hm_modules/nemo.nix rename to modules/hm/nemo.nix diff --git a/hm_modules/nix-index.nix b/modules/hm/nix-index.nix similarity index 100% rename from hm_modules/nix-index.nix rename to modules/hm/nix-index.nix diff --git a/hm_modules/noti.nix b/modules/hm/noti.nix similarity index 100% rename from hm_modules/noti.nix rename to modules/hm/noti.nix diff --git a/hm_modules/nushell.nix b/modules/hm/nushell.nix similarity index 100% rename from hm_modules/nushell.nix rename to modules/hm/nushell.nix diff --git a/hm_modules/obs-studio.nix b/modules/hm/obs-studio.nix similarity index 100% rename from hm_modules/obs-studio.nix rename to modules/hm/obs-studio.nix diff --git a/hm_modules/office.nix b/modules/hm/office.nix similarity index 100% rename from hm_modules/office.nix rename to modules/hm/office.nix diff --git a/hm_modules/onedrive.nix b/modules/hm/onedrive.nix similarity index 100% rename from hm_modules/onedrive.nix rename to modules/hm/onedrive.nix diff --git a/hm_modules/pass.nix b/modules/hm/pass.nix similarity index 100% rename from hm_modules/pass.nix rename to modules/hm/pass.nix diff --git a/hm_modules/picom.nix b/modules/hm/picom.nix similarity index 100% rename from hm_modules/picom.nix rename to modules/hm/picom.nix diff --git a/hm_modules/polybar.nix b/modules/hm/polybar.nix similarity index 100% rename from hm_modules/polybar.nix rename to modules/hm/polybar.nix diff --git a/hm_modules/pro_audio.nix b/modules/hm/pro_audio.nix similarity index 100% rename from hm_modules/pro_audio.nix rename to modules/hm/pro_audio.nix diff --git a/hm_modules/pycharm.nix b/modules/hm/pycharm.nix similarity index 100% rename from hm_modules/pycharm.nix rename to modules/hm/pycharm.nix diff --git a/hm_modules/research.nix b/modules/hm/research.nix similarity index 100% rename from hm_modules/research.nix rename to modules/hm/research.nix diff --git a/modules/hm/rofi.nix b/modules/hm/rofi.nix new file mode 100644 index 0000000..0b92775 --- /dev/null +++ b/modules/hm/rofi.nix @@ -0,0 +1,217 @@ +{ pkgs, ... }: { + + home.packages = builtins.attrValues { + inherit (pkgs) + rofimoji + rofi-bluetooth + rofi-power-menu + rofi-vpn + xdotool + ; + }; + + programs.rofi = { + enable = true; + location = "center"; + font = "${pkgs.rice.font.monospace.name} ${toString pkgs.rice.font.monospace.size}"; + plugins = [ pkgs.rofi-calc ]; + extraConfig = { modi = "drun,run,ssh,window,calc"; }; + terminal = "alacritty"; + theme = "onedark"; + }; + + xdg.configFile."rofi/nord.rasi".text = '' + * { + nord0: #2e3440; + nord1: #3b4252; + nord2: #434c5e; + nord3: #4c566a; + nord4: #d8dee9; + nord5: #e5e9f0; + nord6: #eceff4; + nord7: #8fbcbb; + nord8: #88c0d0; + nord9: #81a1c1; + nord10: #5e81ac; + nord11: #bf616a; + nord12: #d08770; + nord13: #ebcb8b; + nord14: #a3be8c; + nord15: #b48ead; + + background-color: @nord1; + border: 0px; + margin: 0px; + padding: 0px; + spacing: 0px; + text-color: @nord4; + } + #inputbar { + text-color: @nord3; + padding: 6px; + margin: 0px 0px 2px; + children: [ entry ]; + } + #entry { + background-color: @nord3; + text-color: @nord4; + padding: 5px; + } + #message { + border: 0px 0px 1px; + border-color: @nord3; + padding: 0px 0px 6px 7px; + } + #listview { + lines: 10; + padding: 2px 0px 0px; + scrollbar: true; + } + #element { + padding: 0px 0px 0px 7px; + margin: 0px 0px 5px 0px; + text-color: @nord4; + } + #element.normal.normal { + text-color: @nord4; + } + #element.normal.urgent { + text-color: @nord11; + } + #element.normal.active { + text-color: @nord10; + } + #element.alternate.normal { + text-color: @nord4; + } + #element.alternate.urgent { + text-color: @nord11; + } + #element.alternate.active { + text-color: @nord10; + } + #element.selected.normal { + background-color: @nord8; + text-color: @nord1; + } + #element.selected.urgent { + background-color: @nord11; + text-color: @nord4; + } + #element.selected.active { + background-color: @nord10; + text-color: @nord4; + } + #scrollbar { + handle-color: @nord3; + handle-width: 0.50em; + } + #button.selected { + background-color: @nord8; + text-color: @nord4; + } + ''; + xdg.configFile."rofi/onedark.rasi".text = '' + /* + * ROFI One Dark + * + * Based on OneDark.vim (https://github.com/joshdick/onedark.vim) + * + * Author: Benjamin Stauss + * User: me-benni + * + */ + + + * { + black: #000000; + red: #eb6e67; + green: #95ee8f; + yellow: #f8c456; + blue: #6eaafb; + mangenta: #d886f3; + cyan: #6cdcf7; + purple: #C678DF; + emphasis: #50536b; + text: #dfdfdf; + text-alt: #b2b2b2; + fg: #abb2bf; + bg: #282c34; + + spacing: 0; + background-color: transparent; + + font: "Knack Nerd Font 14"; + text-color: @text; + } + + window { + transparency: "real"; + fullscreen: true; + background-color: #282c34dd; + } + + mainbox { + padding: 30% 30%; + } + + inputbar { + margin: 0px 0px 20px 0px; + children: [prompt, textbox-prompt-colon, entry, case-indicator]; + } + + prompt { + text-color: @blue; + } + + textbox-prompt-colon { + expand: false; + str: ":"; + text-color: @text-alt; + } + + entry { + margin: 0px 10px; + } + + listview { + spacing: 5px; + dynamic: true; + scrollbar: false; + } + + element { + padding: 5px; + text-color: @text-alt; + highlight: bold #95ee8f; /* green */ + border-radius: 3px; + } + + element selected { + background-color: @emphasis; + text-color: @text; + } + + element urgent, element selected urgent { + text-color: @red; + } + + element active, element selected active { + text-color: @purple; + } + + message { + padding: 5px; + border-radius: 3px; + background-color: @emphasis; + border: 1px; + border-color: @cyan; + } + + button selected { + padding: 5px; + border-radius: 3px; + background-color: @emphasis; + } + ''; +} diff --git a/hm_modules/screen_locker.nix b/modules/hm/screen_locker.nix similarity index 100% rename from hm_modules/screen_locker.nix rename to modules/hm/screen_locker.nix diff --git a/hm_modules/security.nix b/modules/hm/security.nix similarity index 100% rename from hm_modules/security.nix rename to modules/hm/security.nix diff --git a/hm_modules/shell_aliases.nix b/modules/hm/shell_aliases.nix similarity index 100% rename from hm_modules/shell_aliases.nix rename to modules/hm/shell_aliases.nix diff --git a/hm_modules/spotifyd.nix b/modules/hm/spotifyd.nix similarity index 100% rename from hm_modules/spotifyd.nix rename to modules/hm/spotifyd.nix diff --git a/hm_modules/ssh.nix b/modules/hm/ssh.nix similarity index 100% rename from hm_modules/ssh.nix rename to modules/hm/ssh.nix diff --git a/hm_modules/starship.nix b/modules/hm/starship.nix similarity index 100% rename from hm_modules/starship.nix rename to modules/hm/starship.nix diff --git a/hm_modules/sxhkd.nix b/modules/hm/sxhkd.nix similarity index 100% rename from hm_modules/sxhkd.nix rename to modules/hm/sxhkd.nix diff --git a/hm_modules/syncthing.nix b/modules/hm/syncthing.nix similarity index 100% rename from hm_modules/syncthing.nix rename to modules/hm/syncthing.nix diff --git a/hm_modules/syncthing_tiziano.nix b/modules/hm/syncthing_tiziano.nix similarity index 100% rename from hm_modules/syncthing_tiziano.nix rename to modules/hm/syncthing_tiziano.nix diff --git a/hm_modules/terminator.nix b/modules/hm/terminator.nix similarity index 100% rename from hm_modules/terminator.nix rename to modules/hm/terminator.nix diff --git a/hm_modules/thunar.nix b/modules/hm/thunar.nix similarity index 100% rename from hm_modules/thunar.nix rename to modules/hm/thunar.nix diff --git a/hm_modules/tmux.nix b/modules/hm/tmux.nix similarity index 100% rename from hm_modules/tmux.nix rename to modules/hm/tmux.nix diff --git a/hm_modules/twmn.nix b/modules/hm/twmn.nix similarity index 100% rename from hm_modules/twmn.nix rename to modules/hm/twmn.nix diff --git a/hm_modules/update_background.nix b/modules/hm/update_background.nix similarity index 100% rename from hm_modules/update_background.nix rename to modules/hm/update_background.nix diff --git a/hm_modules/vim.nix b/modules/hm/vim.nix similarity index 100% rename from hm_modules/vim.nix rename to modules/hm/vim.nix diff --git a/hm_modules/webapp.nix b/modules/hm/webapp.nix similarity index 100% rename from hm_modules/webapp.nix rename to modules/hm/webapp.nix diff --git a/hm_modules/xidlehook.nix b/modules/hm/xidlehook.nix similarity index 100% rename from hm_modules/xidlehook.nix rename to modules/hm/xidlehook.nix diff --git a/hm_modules/xresources.nix b/modules/hm/xresources.nix similarity index 100% rename from hm_modules/xresources.nix rename to modules/hm/xresources.nix diff --git a/hm_modules/zathura.nix b/modules/hm/zathura.nix similarity index 100% rename from hm_modules/zathura.nix rename to modules/hm/zathura.nix diff --git a/hm_modules/zellij.nix b/modules/hm/zellij.nix similarity index 100% rename from hm_modules/zellij.nix rename to modules/hm/zellij.nix diff --git a/hm_modules/zoxide.nix b/modules/hm/zoxide.nix similarity index 100% rename from hm_modules/zoxide.nix rename to modules/hm/zoxide.nix diff --git a/hm_modules/zsh.nix b/modules/hm/zsh.nix similarity index 100% rename from hm_modules/zsh.nix rename to modules/hm/zsh.nix diff --git a/odin/hm.nix b/odin/hm.nix index 5650ab1..07e7534 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -44,78 +44,78 @@ }; imports = [ - ../hm_modules/__basic.nix + ../modules/hm/__basic.nix - ../hm_modules/development/cpp.nix - ../hm_modules/development/data.nix - ../hm_modules/development/database.nix - ../hm_modules/development/docker.nix - # ../hm_modules/development/go.nix - ../hm_modules/development/javascript.nix - ../hm_modules/development/kubernetes.nix - ../hm_modules/development/latex.nix - ../hm_modules/development/markdown.nix - ../hm_modules/development/nix.nix - ../hm_modules/development/python.nix - ../hm_modules/development/rust.nix + ../modules/hm/development/cpp.nix + ../modules/hm/development/data.nix + ../modules/hm/development/database.nix + ../modules/hm/development/docker.nix + # ../modules/hm/development/go.nix + ../modules/hm/development/javascript.nix + ../modules/hm/development/kubernetes.nix + ../modules/hm/development/latex.nix + ../modules/hm/development/markdown.nix + ../modules/hm/development/nix.nix + ../modules/hm/development/python.nix + ../modules/hm/development/rust.nix - ../hm_modules/alacritty.nix - ../hm_modules/autorandr.nix - ../hm_modules/biblio.nix - ../hm_modules/bitwarden.nix - ../hm_modules/blender.nix - ../hm_modules/bspwm.nix - ../hm_modules/cava.nix - ../hm_modules/dunst.nix - # ../hm_modules/dwarf-fortress.nix - ../hm_modules/easyeffects.nix - ../hm_modules/firefox.nix - # ../hm_modules/fonts.nix - # ../hm_modules/gnome_shell.nix - # ../hm_modules/grobi.nix - ../hm_modules/gtk_theme.nix - ../hm_modules/heif.nix - ../hm_modules/helix.nix - # ../hm_modules/joystickwake.nix - ../hm_modules/kakoune.nix - ../hm_modules/kdeconnect.nix - # ../hm_modules/keepassxc.nix - ../hm_modules/kicad.nix - # ../hm_modules/kitty.nix - ../hm_modules/lf.nix - ../hm_modules/libinput-gestures.nix - ../hm_modules/mangohud.nix - ../hm_modules/megasync.nix - ../hm_modules/mpv.nix - # ../hm_modules/nautilus.nix - ../hm_modules/ncspot.nix - ../hm_modules/nix-index.nix - ../hm_modules/noti.nix - ../hm_modules/nushell.nix - ../hm_modules/obs-studio.nix - ../hm_modules/office.nix - ../hm_modules/pass.nix - ../hm_modules/picom.nix - ../hm_modules/polybar.nix - ../hm_modules/pro_audio.nix - ../hm_modules/pycharm.nix - ../hm_modules/research.nix - ../hm_modules/rofi.nix - # ../hm_modules/screen_locker.nix - # ../hm_modules/security.nix - ../hm_modules/spotifyd.nix - ../hm_modules/sxhkd.nix - ../hm_modules/syncthing.nix - ../hm_modules/terminator.nix - # ../hm_modules/thunar.nix - # ../hm_modules/twmn.nix - ../hm_modules/update_background.nix - ../hm_modules/vim.nix - ../hm_modules/webapp.nix - ../hm_modules/xidlehook.nix - ../hm_modules/xresources.nix - ../hm_modules/zathura.nix - ../hm_modules/zellij.nix + ../modules/hm/alacritty.nix + ../modules/hm/autorandr.nix + ../modules/hm/biblio.nix + ../modules/hm/bitwarden.nix + ../modules/hm/blender.nix + ../modules/hm/bspwm.nix + ../modules/hm/cava.nix + ../modules/hm/dunst.nix + # ../modules/hm/dwarf-fortress.nix + ../modules/hm/easyeffects.nix + ../modules/hm/firefox.nix + # ../modules/hm/fonts.nix + # ../modules/hm/gnome_shell.nix + # ../modules/hm/grobi.nix + ../modules/hm/gtk_theme.nix + ../modules/hm/heif.nix + ../modules/hm/helix.nix + # ../modules/hm/joystickwake.nix + ../modules/hm/kakoune.nix + ../modules/hm/kdeconnect.nix + # ../modules/hm/keepassxc.nix + ../modules/hm/kicad.nix + # ../modules/hm/kitty.nix + ../modules/hm/lf.nix + ../modules/hm/libinput-gestures.nix + ../modules/hm/mangohud.nix + ../modules/hm/megasync.nix + ../modules/hm/mpv.nix + # ../modules/hm/nautilus.nix + ../modules/hm/ncspot.nix + ../modules/hm/nix-index.nix + ../modules/hm/noti.nix + ../modules/hm/nushell.nix + ../modules/hm/obs-studio.nix + ../modules/hm/office.nix + ../modules/hm/pass.nix + ../modules/hm/picom.nix + ../modules/hm/polybar.nix + ../modules/hm/pro_audio.nix + ../modules/hm/pycharm.nix + ../modules/hm/research.nix + ../modules/hm/rofi.nix + # ../modules/hm/screen_locker.nix + # ../modules/hm/security.nix + ../modules/hm/spotifyd.nix + ../modules/hm/sxhkd.nix + ../modules/hm/syncthing.nix + ../modules/hm/terminator.nix + # ../modules/hm/thunar.nix + # ../modules/hm/twmn.nix + ../modules/hm/update_background.nix + ../modules/hm/vim.nix + ../modules/hm/webapp.nix + ../modules/hm/xidlehook.nix + ../modules/hm/xresources.nix + ../modules/hm/zathura.nix + ../modules/hm/zellij.nix ]; home.stateVersion = "22.05"; diff --git a/thor/hm.nix b/thor/hm.nix index e17d1ab..298d69d 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -34,77 +34,77 @@ services = { gnome-keyring.enable = true; }; imports = [ - ../hm_modules/__basic.nix + ../modules/hm/__basic.nix - ../hm_modules/development/cpp.nix - ../hm_modules/development/data.nix - ../hm_modules/development/database.nix - ../hm_modules/development/docker.nix - # ../hm_modules/development/go.nix - ../hm_modules/development/javascript.nix - ../hm_modules/development/kubernetes.nix - ../hm_modules/development/latex.nix - ../hm_modules/development/markdown.nix - ../hm_modules/development/nix.nix - ../hm_modules/development/python.nix - ../hm_modules/development/rust.nix + ../modules/hm/development/cpp.nix + ../modules/hm/development/data.nix + ../modules/hm/development/database.nix + ../modules/hm/development/docker.nix + # ../modules/hm/development/go.nix + ../modules/hm/development/javascript.nix + ../modules/hm/development/kubernetes.nix + ../modules/hm/development/latex.nix + ../modules/hm/development/markdown.nix + ../modules/hm/development/nix.nix + ../modules/hm/development/python.nix + ../modules/hm/development/rust.nix - ../hm_modules/alacritty.nix - ../hm_modules/autorandr.nix - ../hm_modules/biblio.nix - ../hm_modules/bitwarden.nix - ../hm_modules/blender_nvidia.nix - ../hm_modules/bspwm.nix - ../hm_modules/cava.nix - ../hm_modules/dunst.nix - # ../hm_modules/dwarf-fortress.nix - ../hm_modules/easyeffects.nix - ../hm_modules/firefox.nix - ../hm_modules/fonts.nix - # ../hm_modules/gnome_shell.nix - # ../hm_modules/grobi.nix - ../hm_modules/gtk_theme.nix - ../hm_modules/heif.nix - ../hm_modules/helix.nix - ../hm_modules/joystickwake.nix - ../hm_modules/kakoune.nix - ../hm_modules/kdeconnect.nix - # ../hm_modules/keepassxc.nix - # ../hm_modules/kitty.nix - ../hm_modules/lf.nix - ../hm_modules/lutris.nix - ../hm_modules/mangohud.nix - ../hm_modules/megasync.nix - ../hm_modules/mpv.nix - # ../hm_modules/nautilus.nix - ../hm_modules/ncspot.nix - ../hm_modules/nix-index.nix - ../hm_modules/noti.nix - ../hm_modules/nushell.nix - ../hm_modules/obs-studio.nix - ../hm_modules/office.nix - ../hm_modules/pass.nix - ../hm_modules/picom.nix - ../hm_modules/polybar.nix - ../hm_modules/pro_audio.nix - ../hm_modules/pycharm.nix - ../hm_modules/spotifyd.nix - ../hm_modules/research.nix - ../hm_modules/rofi.nix - # ../hm_modules/screen_locker.nix - # ../hm_modules/security.nix - ../hm_modules/sxhkd.nix - ../hm_modules/syncthing.nix - ../hm_modules/terminator.nix - # ../hm_modules/thunar.nix - # ../hm_modules/twmn.nix - ../hm_modules/update_background.nix - ../hm_modules/vim.nix - ../hm_modules/webapp.nix - ../hm_modules/xidlehook.nix - ../hm_modules/xresources.nix - ../hm_modules/zathura.nix - ../hm_modules/zellij.nix + ../modules/hm/alacritty.nix + ../modules/hm/autorandr.nix + ../modules/hm/biblio.nix + ../modules/hm/bitwarden.nix + ../modules/hm/blender_nvidia.nix + ../modules/hm/bspwm.nix + ../modules/hm/cava.nix + ../modules/hm/dunst.nix + # ../modules/hm/dwarf-fortress.nix + ../modules/hm/easyeffects.nix + ../modules/hm/firefox.nix + ../modules/hm/fonts.nix + # ../modules/hm/gnome_shell.nix + # ../modules/hm/grobi.nix + ../modules/hm/gtk_theme.nix + ../modules/hm/heif.nix + ../modules/hm/helix.nix + ../modules/hm/joystickwake.nix + ../modules/hm/kakoune.nix + ../modules/hm/kdeconnect.nix + # ../modules/hm/keepassxc.nix + # ../modules/hm/kitty.nix + ../modules/hm/lf.nix + ../modules/hm/lutris.nix + ../modules/hm/mangohud.nix + ../modules/hm/megasync.nix + ../modules/hm/mpv.nix + # ../modules/hm/nautilus.nix + ../modules/hm/ncspot.nix + ../modules/hm/nix-index.nix + ../modules/hm/noti.nix + ../modules/hm/nushell.nix + ../modules/hm/obs-studio.nix + ../modules/hm/office.nix + ../modules/hm/pass.nix + ../modules/hm/picom.nix + ../modules/hm/polybar.nix + ../modules/hm/pro_audio.nix + ../modules/hm/pycharm.nix + ../modules/hm/spotifyd.nix + ../modules/hm/research.nix + ../modules/hm/rofi.nix + # ../modules/hm/screen_locker.nix + # ../modules/hm/security.nix + ../modules/hm/sxhkd.nix + ../modules/hm/syncthing.nix + ../modules/hm/terminator.nix + # ../modules/hm/thunar.nix + # ../modules/hm/twmn.nix + ../modules/hm/update_background.nix + ../modules/hm/vim.nix + ../modules/hm/webapp.nix + ../modules/hm/xidlehook.nix + ../modules/hm/xresources.nix + ../modules/hm/zathura.nix + ../modules/hm/zellij.nix ]; home.stateVersion = "22.11"; From 4d706138d60ffe727c0efa4f32b3c620b80f6127 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 19 Jul 2023 10:54:36 +0100 Subject: [PATCH 4/6] Fix old nixos_modules path --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index bde0edd..054570d 100644 --- a/flake.nix +++ b/flake.nix @@ -230,7 +230,7 @@ ./loki/hardware-configuration.nix ./loki/configuration.nix - ./nixos_modules/garage.nix + ./modules/nixos/garage.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./loki/hm.nix; From cbe62f3201763d0debea5ce853cb1f1216a189be Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 19 Jul 2023 11:04:29 +0100 Subject: [PATCH 5/6] Moved hosts configurations to instances --- baldur/hm.nix | 30 ----- flake.nix | 34 ++--- .../baldur}/configuration.nix | 0 .../baldur}/hardware-configuration.nix | 0 instances/baldur/hm.nix | 30 +++++ {freya => instances/freya}/configuration.nix | 0 .../freya}/hardware-configuration.nix | 0 {freya => instances/freya}/hm.nix | 18 +-- {loki => instances/loki}/configuration.nix | 0 .../loki}/hardware-configuration.nix | 0 instances/loki/hm.nix | 32 +++++ instances/loki/hm_tiziano.nix | 23 ++++ .../odin}/common_configuration.nix | 0 .../odin}/configuration-intel.nix | 0 .../odin}/configuration-nvidia.nix | 0 .../odin}/hardware-configuration.nix | 0 instances/odin/hm.nix | 122 ++++++++++++++++++ {thor => instances/thor}/configuration.nix | 0 .../thor}/hardware-configuration.nix | 0 instances/thor/hm.nix | 111 ++++++++++++++++ loki/hm.nix | 32 ----- loki/hm_tiziano.nix | 23 ---- odin/hm.nix | 122 ------------------ thor/hm.nix | 111 ---------------- 24 files changed, 344 insertions(+), 344 deletions(-) delete mode 100644 baldur/hm.nix rename {baldur => instances/baldur}/configuration.nix (100%) rename {baldur => instances/baldur}/hardware-configuration.nix (100%) create mode 100644 instances/baldur/hm.nix rename {freya => instances/freya}/configuration.nix (100%) rename {freya => instances/freya}/hardware-configuration.nix (100%) rename {freya => instances/freya}/hm.nix (54%) rename {loki => instances/loki}/configuration.nix (100%) rename {loki => instances/loki}/hardware-configuration.nix (100%) create mode 100644 instances/loki/hm.nix create mode 100644 instances/loki/hm_tiziano.nix rename {odin => instances/odin}/common_configuration.nix (100%) rename {odin => instances/odin}/configuration-intel.nix (100%) rename {odin => instances/odin}/configuration-nvidia.nix (100%) rename {odin => instances/odin}/hardware-configuration.nix (100%) create mode 100644 instances/odin/hm.nix rename {thor => instances/thor}/configuration.nix (100%) rename {thor => instances/thor}/hardware-configuration.nix (100%) create mode 100644 instances/thor/hm.nix delete mode 100644 loki/hm.nix delete mode 100644 loki/hm_tiziano.nix delete mode 100644 odin/hm.nix delete mode 100644 thor/hm.nix diff --git a/baldur/hm.nix b/baldur/hm.nix deleted file mode 100644 index 035835a..0000000 --- a/baldur/hm.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: { - home = { - language.base = "it_IT.UTF-8"; - keyboard = { - layout = "it"; - options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; - }; - packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; }; - }; - imports = [ - ../modules/hm/__basic.nix - - # ../modules/hm/development/cpp.nix - # ../modules/hm/development/data.nix - # ../modules/hm/development/go.nix - # ../modules/hm/development/javascript.nix - # ../modules/hm/development/latex.nix - # ../modules/hm/development/python.nix - # ../modules/hm/development/rust.nix - - # ../modules/hm/fonts.nix - ../modules/hm/helix.nix - # ../modules/hm/kitty.nix - # ../modules/hm/lf.nix - # ../modules/hm/megasync.nix - # ../modules/hm/noti.nix - ]; - - home.stateVersion = "22.05"; -} diff --git a/flake.nix b/flake.nix index 054570d..7cb2035 100644 --- a/flake.nix +++ b/flake.nix @@ -121,10 +121,10 @@ modules = commonModules ++ [ ./modules/nixos/server - ./thor/hardware-configuration.nix + ./instances/thor/hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-pc-ssd - ./thor/configuration.nix + ./instances/thor/configuration.nix ./modules/nixos/pro_audio.nix ./modules/nixos/sesar.nix @@ -132,7 +132,7 @@ ./modules/nixos/steam-link.nix ./modules/nixos/kdeconnect.nix ] ++ homeManagerModules ++ [ - { home-manager.users.bertof = import ./thor/hm.nix; } + { home-manager.users.bertof = import ./instances/thor/hm.nix; } ]; }; }; @@ -147,8 +147,8 @@ nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop-ssd - ./odin/hardware-configuration.nix - ./odin/common_configuration.nix + ./instances/odin/hardware-configuration.nix + ./instances/odin/common_configuration.nix ./modules/nixos/pro_audio.nix ./modules/nixos/sesar.nix @@ -157,20 +157,20 @@ ./modules/nixos/kdeconnect.nix ./modules/nixos/garage.nix ] ++ homeManagerModules ++ [ - { home-manager.users.bertof = import ./odin/hm.nix; } + { home-manager.users.bertof = import ./instances/odin/hm.nix; } ]; in rec { odin-nvidia = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ odinCommonModules - ++ [ ./odin/configuration-nvidia.nix ]; + ++ [ ./instances/odin/configuration-nvidia.nix ]; }; odin-intel = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ odinCommonModules - ++ [ ./odin/configuration-intel.nix ]; + ++ [ ./instances/odin/configuration-intel.nix ]; }; odin = odin-intel; @@ -188,13 +188,13 @@ }) ./modules/nixos/server - ./freya/hardware-configuration.nix - ./freya/configuration.nix + ./instances/freya/hardware-configuration.nix + ./instances/freya/configuration.nix ./modules/nixos/garage.nix ./modules/nixos/nextcloud.nix ] ++ homeManagerModules ++ [ - { home-manager.users.bertof = import ./freya/hm.nix; } + { home-manager.users.bertof = import ./instances/freya/hm.nix; } ]; }; }; @@ -207,12 +207,12 @@ modules = commonModules ++ [ ./modules/nixos/server # ./baldur/hardware-configuration.nix - ./baldur/configuration.nix + ./instances/baldur/configuration.nix "${nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix" ./modules/nixos/digitalocean.nix ./modules/nixos/garage.nix ] ++ homeManagerModules ++ [ - { home-manager.users.bertof = import ./baldur/hm.nix; } + { home-manager.users.bertof = import ./instances/baldur/hm.nix; } ]; }; }; @@ -227,14 +227,14 @@ nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-ssd - ./loki/hardware-configuration.nix - ./loki/configuration.nix + ./instances/loki/hardware-configuration.nix + ./instances/loki/configuration.nix ./modules/nixos/garage.nix ] ++ homeManagerModules ++ [ { - home-manager.users.bertof = import ./loki/hm.nix; - home-manager.users.tiziano = import ./loki/hm_tiziano.nix; + home-manager.users.bertof = import ./instances/loki/hm.nix; + home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix; } ]; }; diff --git a/baldur/configuration.nix b/instances/baldur/configuration.nix similarity index 100% rename from baldur/configuration.nix rename to instances/baldur/configuration.nix diff --git a/baldur/hardware-configuration.nix b/instances/baldur/hardware-configuration.nix similarity index 100% rename from baldur/hardware-configuration.nix rename to instances/baldur/hardware-configuration.nix diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix new file mode 100644 index 0000000..62583f5 --- /dev/null +++ b/instances/baldur/hm.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: { + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "it"; + options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; + }; + packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; }; + }; + imports = [ + ../../modules/hm/__basic.nix + + # ../../modules/hm/development/cpp.nix + # ../../modules/hm/development/data.nix + # ../../modules/hm/development/go.nix + # ../../modules/hm/development/javascript.nix + # ../../modules/hm/development/latex.nix + # ../../modules/hm/development/python.nix + # ../../modules/hm/development/rust.nix + + # ../../modules/hm/fonts.nix + ../../modules/hm/helix.nix + # ../../modules/hm/kitty.nix + # ../../modules/hm/lf.nix + # ../../modules/hm/megasync.nix + # ../../modules/hm/noti.nix + ]; + + home.stateVersion = "22.05"; +} diff --git a/freya/configuration.nix b/instances/freya/configuration.nix similarity index 100% rename from freya/configuration.nix rename to instances/freya/configuration.nix diff --git a/freya/hardware-configuration.nix b/instances/freya/hardware-configuration.nix similarity index 100% rename from freya/hardware-configuration.nix rename to instances/freya/hardware-configuration.nix diff --git a/freya/hm.nix b/instances/freya/hm.nix similarity index 54% rename from freya/hm.nix rename to instances/freya/hm.nix index a726f36..a91fb93 100644 --- a/freya/hm.nix +++ b/instances/freya/hm.nix @@ -11,16 +11,16 @@ }; }; imports = [ - ../modules/hm/__basic.nix + ../../modules/hm/__basic.nix - ../modules/hm/cava.nix - ../modules/hm/dunst.nix - ../modules/hm/helix.nix - ../modules/hm/kitty.nix - ../modules/hm/lf.nix - ../modules/hm/spotifyd.nix - ../modules/hm/syncthing.nix - # ../modules/hm/xidlehook.nix + ../../modules/hm/cava.nix + ../../modules/hm/dunst.nix + ../../modules/hm/helix.nix + ../../modules/hm/kitty.nix + ../../modules/hm/lf.nix + ../../modules/hm/spotifyd.nix + ../../modules/hm/syncthing.nix + # ../../modules/hm/xidlehook.nix ]; home.stateVersion = "22.11"; diff --git a/loki/configuration.nix b/instances/loki/configuration.nix similarity index 100% rename from loki/configuration.nix rename to instances/loki/configuration.nix diff --git a/loki/hardware-configuration.nix b/instances/loki/hardware-configuration.nix similarity index 100% rename from loki/hardware-configuration.nix rename to instances/loki/hardware-configuration.nix diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix new file mode 100644 index 0000000..3cc6ead --- /dev/null +++ b/instances/loki/hm.nix @@ -0,0 +1,32 @@ +{ + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "it"; + options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; + }; + }; + imports = [ + ../../modules/hm/__basic.nix + + # ../../modules/hm/development/cpp.nix + # ../../modules/hm/development/data.nix + # ../../modules/hm/development/go.nix + # ../../modules/hm/development/javascript.nix + # ../../modules/hm/development/latex.nix + # ../../modules/hm/development/nix.nix + # ../../modules/hm/development/python.nix + # ../../modules/hm/development/rust.nix + + ../../modules/hm/helix.nix + ../../modules/hm/kakoune.nix + ../../modules/hm/kitty.nix + ../../modules/hm/lf.nix + ../../modules/hm/megasync.nix + ../../modules/hm/syncthing.nix + + ../../modules/hm/shell_aliases.nix + ]; + + home.stateVersion = "22.11"; +} diff --git a/instances/loki/hm_tiziano.nix b/instances/loki/hm_tiziano.nix new file mode 100644 index 0000000..c8bfaed --- /dev/null +++ b/instances/loki/hm_tiziano.nix @@ -0,0 +1,23 @@ +{ + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "it"; + options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; + }; + }; + imports = [ + ../../modules/hm/__basic.nix + + ../../modules/hm/helix.nix + ../../modules/hm/kakoune.nix + ../../modules/hm/kitty.nix + ../../modules/hm/lf.nix + ../../modules/hm/megasync.nix + ../../modules/hm/syncthing_tiziano.nix + + ../../modules/hm/shell_aliases.nix + ]; + + home.stateVersion = "21.11"; +} diff --git a/odin/common_configuration.nix b/instances/odin/common_configuration.nix similarity index 100% rename from odin/common_configuration.nix rename to instances/odin/common_configuration.nix diff --git a/odin/configuration-intel.nix b/instances/odin/configuration-intel.nix similarity index 100% rename from odin/configuration-intel.nix rename to instances/odin/configuration-intel.nix diff --git a/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix similarity index 100% rename from odin/configuration-nvidia.nix rename to instances/odin/configuration-nvidia.nix diff --git a/odin/hardware-configuration.nix b/instances/odin/hardware-configuration.nix similarity index 100% rename from odin/hardware-configuration.nix rename to instances/odin/hardware-configuration.nix diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix new file mode 100644 index 0000000..ab804c5 --- /dev/null +++ b/instances/odin/hm.nix @@ -0,0 +1,122 @@ +{ pkgs, ... }: { + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "it,us,us"; + variant = ",,colemak"; + options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; + }; + packages = builtins.attrValues { + inherit (pkgs) + # element-desktop # matrix client + # freecad + # lutris + # minecraft + # mycrypto + # pcmanfm + # pulseaudio + # signal-desktop + # slack + # wineFull + arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us; + inherit (pkgs.gnome) + # geary + # gnome-boxes + # gnome-calendar + # gnome-sound-recorder + # seahorse + eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem; + inherit (pkgs.unstable_pkgs) postman skypeforlinux; + }; + }; + + services = { gnome-keyring.enable = true; }; + + xsession = { + enable = true; + numlock.enable = true; + initExtra = '' + ## Touchpad + ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1 + ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1 + ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1 + ''; + }; + + imports = [ + ../../modules/hm/__basic.nix + + ../../modules/hm/development/cpp.nix + ../../modules/hm/development/data.nix + ../../modules/hm/development/database.nix + ../../modules/hm/development/docker.nix + # ../../modules/hm/development/go.nix + ../../modules/hm/development/javascript.nix + ../../modules/hm/development/kubernetes.nix + ../../modules/hm/development/latex.nix + ../../modules/hm/development/markdown.nix + ../../modules/hm/development/nix.nix + ../../modules/hm/development/python.nix + ../../modules/hm/development/rust.nix + + ../../modules/hm/alacritty.nix + ../../modules/hm/autorandr.nix + ../../modules/hm/biblio.nix + ../../modules/hm/bitwarden.nix + ../../modules/hm/blender.nix + ../../modules/hm/bspwm.nix + ../../modules/hm/cava.nix + ../../modules/hm/dunst.nix + # ../../modules/hm/dwarf-fortress.nix + ../../modules/hm/easyeffects.nix + ../../modules/hm/firefox.nix + # ../../modules/hm/fonts.nix + # ../../modules/hm/gnome_shell.nix + # ../../modules/hm/grobi.nix + ../../modules/hm/gtk_theme.nix + ../../modules/hm/heif.nix + ../../modules/hm/helix.nix + # ../../modules/hm/joystickwake.nix + ../../modules/hm/kakoune.nix + ../../modules/hm/kdeconnect.nix + # ../../modules/hm/keepassxc.nix + ../../modules/hm/kicad.nix + # ../../modules/hm/kitty.nix + ../../modules/hm/lf.nix + ../../modules/hm/libinput-gestures.nix + ../../modules/hm/mangohud.nix + ../../modules/hm/megasync.nix + ../../modules/hm/mpv.nix + # ../../modules/hm/nautilus.nix + ../../modules/hm/ncspot.nix + ../../modules/hm/nix-index.nix + ../../modules/hm/noti.nix + ../../modules/hm/nushell.nix + ../../modules/hm/obs-studio.nix + ../../modules/hm/office.nix + ../../modules/hm/pass.nix + ../../modules/hm/picom.nix + ../../modules/hm/polybar.nix + ../../modules/hm/pro_audio.nix + ../../modules/hm/pycharm.nix + ../../modules/hm/research.nix + ../../modules/hm/rofi.nix + # ../../modules/hm/screen_locker.nix + # ../../modules/hm/security.nix + ../../modules/hm/spotifyd.nix + ../../modules/hm/sxhkd.nix + ../../modules/hm/syncthing.nix + ../../modules/hm/terminator.nix + # ../../modules/hm/thunar.nix + # ../../modules/hm/twmn.nix + ../../modules/hm/update_background.nix + ../../modules/hm/vim.nix + ../../modules/hm/webapp.nix + ../../modules/hm/xidlehook.nix + ../../modules/hm/xresources.nix + ../../modules/hm/zathura.nix + ../../modules/hm/zellij.nix + ]; + + home.stateVersion = "22.05"; +} diff --git a/thor/configuration.nix b/instances/thor/configuration.nix similarity index 100% rename from thor/configuration.nix rename to instances/thor/configuration.nix diff --git a/thor/hardware-configuration.nix b/instances/thor/hardware-configuration.nix similarity index 100% rename from thor/hardware-configuration.nix rename to instances/thor/hardware-configuration.nix diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix new file mode 100644 index 0000000..909333d --- /dev/null +++ b/instances/thor/hm.nix @@ -0,0 +1,111 @@ +{ pkgs, ... }: { + home = { + language.base = "it_IT.UTF-8"; + keyboard = { + layout = "us,it"; + variant = ",colemak,"; + options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; + }; + packages = builtins.attrValues { + inherit (pkgs) + # electrum + # element-desktop # matrix client + evolution + # freecad + # minecraft + # mycrypto + # pcmanfm + # pulseaudio + # signal-desktop + # slack + # wineFull + arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us; + inherit (pkgs.gnome) + # geary + # gnome-boxes + # gnome-calendar + # gnome-sound-recorder + # seahorse + eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem; + inherit (pkgs.unstable_pkgs) postman skypeforlinux; + }; + }; + + services = { gnome-keyring.enable = true; }; + + imports = [ + ../../modules/hm/__basic.nix + + ../../modules/hm/development/cpp.nix + ../../modules/hm/development/data.nix + ../../modules/hm/development/database.nix + ../../modules/hm/development/docker.nix + # ../../modules/hm/development/go.nix + ../../modules/hm/development/javascript.nix + ../../modules/hm/development/kubernetes.nix + ../../modules/hm/development/latex.nix + ../../modules/hm/development/markdown.nix + ../../modules/hm/development/nix.nix + ../../modules/hm/development/python.nix + ../../modules/hm/development/rust.nix + + ../../modules/hm/alacritty.nix + ../../modules/hm/autorandr.nix + ../../modules/hm/biblio.nix + ../../modules/hm/bitwarden.nix + ../../modules/hm/blender_nvidia.nix + ../../modules/hm/bspwm.nix + ../../modules/hm/cava.nix + ../../modules/hm/dunst.nix + # ../../modules/hm/dwarf-fortress.nix + ../../modules/hm/easyeffects.nix + ../../modules/hm/firefox.nix + ../../modules/hm/fonts.nix + # ../../modules/hm/gnome_shell.nix + # ../../modules/hm/grobi.nix + ../../modules/hm/gtk_theme.nix + ../../modules/hm/heif.nix + ../../modules/hm/helix.nix + ../../modules/hm/joystickwake.nix + ../../modules/hm/kakoune.nix + ../../modules/hm/kdeconnect.nix + # ../../modules/hm/keepassxc.nix + # ../../modules/hm/kitty.nix + ../../modules/hm/lf.nix + ../../modules/hm/lutris.nix + ../../modules/hm/mangohud.nix + ../../modules/hm/megasync.nix + ../../modules/hm/mpv.nix + # ../../modules/hm/nautilus.nix + ../../modules/hm/ncspot.nix + ../../modules/hm/nix-index.nix + ../../modules/hm/noti.nix + ../../modules/hm/nushell.nix + ../../modules/hm/obs-studio.nix + ../../modules/hm/office.nix + ../../modules/hm/pass.nix + ../../modules/hm/picom.nix + ../../modules/hm/polybar.nix + ../../modules/hm/pro_audio.nix + ../../modules/hm/pycharm.nix + ../../modules/hm/spotifyd.nix + ../../modules/hm/research.nix + ../../modules/hm/rofi.nix + # ../../modules/hm/screen_locker.nix + # ../../modules/hm/security.nix + ../../modules/hm/sxhkd.nix + ../../modules/hm/syncthing.nix + ../../modules/hm/terminator.nix + # ../../modules/hm/thunar.nix + # ../../modules/hm/twmn.nix + ../../modules/hm/update_background.nix + ../../modules/hm/vim.nix + ../../modules/hm/webapp.nix + ../../modules/hm/xidlehook.nix + ../../modules/hm/xresources.nix + ../../modules/hm/zathura.nix + ../../modules/hm/zellij.nix + ]; + + home.stateVersion = "22.11"; +} diff --git a/loki/hm.nix b/loki/hm.nix deleted file mode 100644 index a371a36..0000000 --- a/loki/hm.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - home = { - language.base = "it_IT.UTF-8"; - keyboard = { - layout = "it"; - options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; - }; - }; - imports = [ - ../modules/hm/__basic.nix - - # ../modules/hm/development/cpp.nix - # ../modules/hm/development/data.nix - # ../modules/hm/development/go.nix - # ../modules/hm/development/javascript.nix - # ../modules/hm/development/latex.nix - # ../modules/hm/development/nix.nix - # ../modules/hm/development/python.nix - # ../modules/hm/development/rust.nix - - ../modules/hm/helix.nix - ../modules/hm/kakoune.nix - ../modules/hm/kitty.nix - ../modules/hm/lf.nix - ../modules/hm/megasync.nix - ../modules/hm/syncthing.nix - - ../modules/hm/shell_aliases.nix - ]; - - home.stateVersion = "22.11"; -} diff --git a/loki/hm_tiziano.nix b/loki/hm_tiziano.nix deleted file mode 100644 index 750bfb6..0000000 --- a/loki/hm_tiziano.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - home = { - language.base = "it_IT.UTF-8"; - keyboard = { - layout = "it"; - options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; - }; - }; - imports = [ - ../modules/hm/__basic.nix - - ../modules/hm/helix.nix - ../modules/hm/kakoune.nix - ../modules/hm/kitty.nix - ../modules/hm/lf.nix - ../modules/hm/megasync.nix - ../modules/hm/syncthing_tiziano.nix - - ../modules/hm/shell_aliases.nix - ]; - - home.stateVersion = "21.11"; -} diff --git a/odin/hm.nix b/odin/hm.nix deleted file mode 100644 index 07e7534..0000000 --- a/odin/hm.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ pkgs, ... }: { - home = { - language.base = "it_IT.UTF-8"; - keyboard = { - layout = "it,us,us"; - variant = ",,colemak"; - options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; - }; - packages = builtins.attrValues { - inherit (pkgs) - # element-desktop # matrix client - # freecad - # lutris - # minecraft - # mycrypto - # pcmanfm - # pulseaudio - # signal-desktop - # slack - # wineFull - arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us; - inherit (pkgs.gnome) - # geary - # gnome-boxes - # gnome-calendar - # gnome-sound-recorder - # seahorse - eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem; - inherit (pkgs.unstable_pkgs) postman skypeforlinux; - }; - }; - - services = { gnome-keyring.enable = true; }; - - xsession = { - enable = true; - numlock.enable = true; - initExtra = '' - ## Touchpad - ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1 - ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1 - ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1 - ''; - }; - - imports = [ - ../modules/hm/__basic.nix - - ../modules/hm/development/cpp.nix - ../modules/hm/development/data.nix - ../modules/hm/development/database.nix - ../modules/hm/development/docker.nix - # ../modules/hm/development/go.nix - ../modules/hm/development/javascript.nix - ../modules/hm/development/kubernetes.nix - ../modules/hm/development/latex.nix - ../modules/hm/development/markdown.nix - ../modules/hm/development/nix.nix - ../modules/hm/development/python.nix - ../modules/hm/development/rust.nix - - ../modules/hm/alacritty.nix - ../modules/hm/autorandr.nix - ../modules/hm/biblio.nix - ../modules/hm/bitwarden.nix - ../modules/hm/blender.nix - ../modules/hm/bspwm.nix - ../modules/hm/cava.nix - ../modules/hm/dunst.nix - # ../modules/hm/dwarf-fortress.nix - ../modules/hm/easyeffects.nix - ../modules/hm/firefox.nix - # ../modules/hm/fonts.nix - # ../modules/hm/gnome_shell.nix - # ../modules/hm/grobi.nix - ../modules/hm/gtk_theme.nix - ../modules/hm/heif.nix - ../modules/hm/helix.nix - # ../modules/hm/joystickwake.nix - ../modules/hm/kakoune.nix - ../modules/hm/kdeconnect.nix - # ../modules/hm/keepassxc.nix - ../modules/hm/kicad.nix - # ../modules/hm/kitty.nix - ../modules/hm/lf.nix - ../modules/hm/libinput-gestures.nix - ../modules/hm/mangohud.nix - ../modules/hm/megasync.nix - ../modules/hm/mpv.nix - # ../modules/hm/nautilus.nix - ../modules/hm/ncspot.nix - ../modules/hm/nix-index.nix - ../modules/hm/noti.nix - ../modules/hm/nushell.nix - ../modules/hm/obs-studio.nix - ../modules/hm/office.nix - ../modules/hm/pass.nix - ../modules/hm/picom.nix - ../modules/hm/polybar.nix - ../modules/hm/pro_audio.nix - ../modules/hm/pycharm.nix - ../modules/hm/research.nix - ../modules/hm/rofi.nix - # ../modules/hm/screen_locker.nix - # ../modules/hm/security.nix - ../modules/hm/spotifyd.nix - ../modules/hm/sxhkd.nix - ../modules/hm/syncthing.nix - ../modules/hm/terminator.nix - # ../modules/hm/thunar.nix - # ../modules/hm/twmn.nix - ../modules/hm/update_background.nix - ../modules/hm/vim.nix - ../modules/hm/webapp.nix - ../modules/hm/xidlehook.nix - ../modules/hm/xresources.nix - ../modules/hm/zathura.nix - ../modules/hm/zellij.nix - ]; - - home.stateVersion = "22.05"; -} diff --git a/thor/hm.nix b/thor/hm.nix deleted file mode 100644 index 298d69d..0000000 --- a/thor/hm.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ pkgs, ... }: { - home = { - language.base = "it_IT.UTF-8"; - keyboard = { - layout = "us,it"; - variant = ",colemak,"; - options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; - }; - packages = builtins.attrValues { - inherit (pkgs) - # electrum - # element-desktop # matrix client - evolution - # freecad - # minecraft - # mycrypto - # pcmanfm - # pulseaudio - # signal-desktop - # slack - # wineFull - arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us; - inherit (pkgs.gnome) - # geary - # gnome-boxes - # gnome-calendar - # gnome-sound-recorder - # seahorse - eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem; - inherit (pkgs.unstable_pkgs) postman skypeforlinux; - }; - }; - - services = { gnome-keyring.enable = true; }; - - imports = [ - ../modules/hm/__basic.nix - - ../modules/hm/development/cpp.nix - ../modules/hm/development/data.nix - ../modules/hm/development/database.nix - ../modules/hm/development/docker.nix - # ../modules/hm/development/go.nix - ../modules/hm/development/javascript.nix - ../modules/hm/development/kubernetes.nix - ../modules/hm/development/latex.nix - ../modules/hm/development/markdown.nix - ../modules/hm/development/nix.nix - ../modules/hm/development/python.nix - ../modules/hm/development/rust.nix - - ../modules/hm/alacritty.nix - ../modules/hm/autorandr.nix - ../modules/hm/biblio.nix - ../modules/hm/bitwarden.nix - ../modules/hm/blender_nvidia.nix - ../modules/hm/bspwm.nix - ../modules/hm/cava.nix - ../modules/hm/dunst.nix - # ../modules/hm/dwarf-fortress.nix - ../modules/hm/easyeffects.nix - ../modules/hm/firefox.nix - ../modules/hm/fonts.nix - # ../modules/hm/gnome_shell.nix - # ../modules/hm/grobi.nix - ../modules/hm/gtk_theme.nix - ../modules/hm/heif.nix - ../modules/hm/helix.nix - ../modules/hm/joystickwake.nix - ../modules/hm/kakoune.nix - ../modules/hm/kdeconnect.nix - # ../modules/hm/keepassxc.nix - # ../modules/hm/kitty.nix - ../modules/hm/lf.nix - ../modules/hm/lutris.nix - ../modules/hm/mangohud.nix - ../modules/hm/megasync.nix - ../modules/hm/mpv.nix - # ../modules/hm/nautilus.nix - ../modules/hm/ncspot.nix - ../modules/hm/nix-index.nix - ../modules/hm/noti.nix - ../modules/hm/nushell.nix - ../modules/hm/obs-studio.nix - ../modules/hm/office.nix - ../modules/hm/pass.nix - ../modules/hm/picom.nix - ../modules/hm/polybar.nix - ../modules/hm/pro_audio.nix - ../modules/hm/pycharm.nix - ../modules/hm/spotifyd.nix - ../modules/hm/research.nix - ../modules/hm/rofi.nix - # ../modules/hm/screen_locker.nix - # ../modules/hm/security.nix - ../modules/hm/sxhkd.nix - ../modules/hm/syncthing.nix - ../modules/hm/terminator.nix - # ../modules/hm/thunar.nix - # ../modules/hm/twmn.nix - ../modules/hm/update_background.nix - ../modules/hm/vim.nix - ../modules/hm/webapp.nix - ../modules/hm/xidlehook.nix - ../modules/hm/xresources.nix - ../modules/hm/zathura.nix - ../modules/hm/zellij.nix - ]; - - home.stateVersion = "22.11"; -} From dda0e4c6270c70c3e8ef5c466b802b26b5067796 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 19 Jul 2023 11:09:03 +0100 Subject: [PATCH 6/6] Unused eval hook --- .envrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.envrc b/.envrc index 0d69151..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1 @@ use flake -eval "$shellHook"