From 75aba098e9eb3e6046ca55f1a9a746416621ad73 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 15 May 2024 19:03:26 -0400 Subject: [PATCH] splitting things up --- configs/hypr/includes.conf | 1 + flake.nix | 10 +++----- modules/docker/core.nix | 4 --- modules/nix/core.nix | 52 ++++++++++++++++++++++++++++++++++++++ modules/nix/docker.nix | 7 +++++ modules/nix/main.nix | 14 ++++++++++ modules/nix/tmux.nix | 7 +++++ modules/os/core.nix | 32 ----------------------- modules/os/main.nix | 8 +----- modules/os/nix.nix | 25 ------------------ 10 files changed, 86 insertions(+), 74 deletions(-) delete mode 100644 modules/docker/core.nix create mode 100644 modules/nix/core.nix create mode 100644 modules/nix/docker.nix create mode 100644 modules/nix/main.nix create mode 100644 modules/nix/tmux.nix delete mode 100644 modules/os/nix.nix diff --git a/configs/hypr/includes.conf b/configs/hypr/includes.conf index c7bbbb9..4f4d1b2 100644 --- a/configs/hypr/includes.conf +++ b/configs/hypr/includes.conf @@ -17,6 +17,7 @@ $exit = nwg-bar -t hyprland.json -p center -a middle -i 48 -s $theme.css exec-once = wl-paste --type text --watch cliphist store exec-once = wl-paste --type image --watch cliphist store # exec = nwg-screenshot-applet +exec-once = hypridle exec = nwg-look -a exec = nwg-drawer -r -c 6 -is 64 -fscol 2 -s $theme.css -term $term -ft exec = nwg-panel -c $theme -s $theme.css diff --git a/flake.nix b/flake.nix index dfb471b..5b207eb 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,10 @@ (import ./hosts/fwbook.nix { user = user; }) + (import ./modules/nix/main.nix { + user = user; + systemStateVersion = systemStateVersion; + }) (import ./modules/os/main.nix { user = user; hostName = hostName; @@ -62,12 +66,6 @@ hostName = hostName; homeMangerVersion = homeMangerVersion; }) - { - # enable docker - virtualisation.docker.enable = true; - # enable unfree - nixpkgs.config.allowUnfree = true; - } ]; }; }; diff --git a/modules/docker/core.nix b/modules/docker/core.nix deleted file mode 100644 index 7fbe263..0000000 --- a/modules/docker/core.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - virtualisation.docker.enable = true; -} \ No newline at end of file diff --git a/modules/nix/core.nix b/modules/nix/core.nix new file mode 100644 index 0000000..4d64dd1 --- /dev/null +++ b/modules/nix/core.nix @@ -0,0 +1,52 @@ +{ user, systemStateVersion }: +{ pkgs, ... }: +{ + # Nix core + system.stateVersion = systemStateVersion; + nixpkgs.config.allowUnfree = true; + services.hydra.useSubstitutes = true; + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + trusted-substituters = [ + "https://cache.flox.dev" + "https://devenv.cachix.org" + ]; + trusted-users = [ "root" user.name ]; + trusted-public-keys = [ + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + ]; + }; + # Set your time zone. + time.timeZone = "America/Toronto"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_CA.UTF-8"; + + # System Packages + programs.zsh.enable = true; + programs.nix-ld.enable = true; + environment.systemPackages = with pkgs; [ + # nix utils + nix-index + nil + cachix + + # shell tools + wget + + # misc + glib + glibc + ]; + # Storage Optim + nix.optimise.automatic = true; + nix.optimise.dates = [ "01:00" ]; + services.cron = { + enable = true; + systemCronJobs = [ + "* 23 * * * root nix-collect-garbage --delete-older-than 1d" + "* 23 * * * ${user.name} nix-collect-garbage --delete-older-than 1d" + ]; + }; +} diff --git a/modules/nix/docker.nix b/modules/nix/docker.nix new file mode 100644 index 0000000..d92b86e --- /dev/null +++ b/modules/nix/docker.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + virtualisation.docker.enable = true; + environment.systemPackages = with pkgs; [ + docker-compose + ]; +} diff --git a/modules/nix/main.nix b/modules/nix/main.nix new file mode 100644 index 0000000..c8f57ee --- /dev/null +++ b/modules/nix/main.nix @@ -0,0 +1,14 @@ +{ user +, systemStateVersion +}: +{ ... }: +{ + imports = [ + (import ./core.nix { + user = user; + systemStateVersion = systemStateVersion; + }) + ./docker.nix + ./tmux.nix + ]; +} diff --git a/modules/nix/tmux.nix b/modules/nix/tmux.nix new file mode 100644 index 0000000..9de02db --- /dev/null +++ b/modules/nix/tmux.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + programs.tmux = { + enable = true; + clock24 = true; + }; +} diff --git a/modules/os/core.nix b/modules/os/core.nix index 831d76d..a63bcad 100644 --- a/modules/os/core.nix +++ b/modules/os/core.nix @@ -1,58 +1,26 @@ -{ user }: { pkgs, ... }: { - # Set your time zone. - time.timeZone = "America/Toronto"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; - # System Packages - programs.zsh.enable = true; - programs.nix-ld.enable = true; services.flatpak.enable = true; environment.systemPackages = with pkgs; [ # nix utils - nix-index appimage-run - nil - cachix # shell tools - zsh git usbutils - wget htop # system utils nfs-utils # misc - glib - glibc glib-networking - # docker - docker-compose - # printer system-config-printer ]; services.xserver.excludePackages = with pkgs; [ xterm ]; - programs.tmux = { - enable = true; - clock24 = true; - }; - # Storage Optim - nix.optimise.automatic = true; - services.cron = { - enable = true; - systemCronJobs = [ - "* 23 * * * root nix-collect-garbage --delete-older-than 1d" - "* 23 * * * ${user.name} nix-collect-garbage --delete-older-than 1d" - ]; - }; } diff --git a/modules/os/main.nix b/modules/os/main.nix index 78a47c5..3c6d4b8 100644 --- a/modules/os/main.nix +++ b/modules/os/main.nix @@ -1,7 +1,6 @@ { user , hostName , firewall -, systemStateVersion , enableCore ? true , enableFonts ? true , enableNetowrking ? true @@ -12,12 +11,7 @@ }: { pkgs, ... }: { - imports = [ - (import ./nix.nix { - user = user; - systemStateVersion = systemStateVersion; - }) - ] ++ (if enableCore then [ + imports = [ ] ++ (if enableCore then [ (import ./core.nix { user = user; }) diff --git a/modules/os/nix.nix b/modules/os/nix.nix deleted file mode 100644 index 7047822..0000000 --- a/modules/os/nix.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ systemStateVersion, user }: -{ pkgs, ... }: -{ - nixpkgs.config.allowUnfree = true; - system.stateVersion = systemStateVersion; - services.hydra.useSubstitutes = true; - nix = { - optimise = { - automatic = true; - dates = [ "01:00" ]; - }; - settings = { - experimental-features = [ "nix-command" "flakes" ]; - }; - settings.trusted-substituters = [ - "https://cache.flox.dev" - "https://devenv.cachix.org" - ]; - settings.trusted-users = [ "root" user.name ]; - settings.trusted-public-keys = [ - "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" - "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" - ]; - }; -}