diff --git a/README.org b/README.org index d6a11b2..a1d7ba7 100644 --- a/README.org +++ b/README.org @@ -127,12 +127,13 @@ Both include the home-manager module. Primarily I chose that route so that I cou ** General All my machines have these settings. -Every machine has it's own hardware config/ +Every machine has it's own hardware config and we'll throw in the cachix piece here too. #+NAME: hardware #+begin_src nix imports = [ ./hardware-configuration.nix + /etc/nixos/cachix.nix ]; #+end_src @@ -146,9 +147,10 @@ nix = { }; #+end_src -I use plasma and awesome mostly as my desktop. +I use plasma and awesome mostly as my desktop. Also all desktops will likely need ntfs support in order to work with windows devices. #+NAME: desktop #+begin_src nix +boot.supportedFilesystems = [ "ntfs" ]; services.xserver = { enable = true; windowManager.awesome = { @@ -267,6 +269,7 @@ killall git tmux dutree +cachix unzip unrar p7zip @@ -276,6 +279,7 @@ usbutils binutils podman-compose exa +# img2pdf yt-dlp bat rsync @@ -398,6 +402,7 @@ OVMFFull element-desktop-wayland scrcpy python +python3 airshipper # hyprland @@ -420,6 +425,7 @@ qtcreator extra-cmake-modules pkg-config libsForQt5.wrapQtAppsHook +python310Packages.pyqt5 # LIBRARIES FOR DEV qt5.full qt5.qtbase @@ -649,7 +655,7 @@ Notice how I am including all of my software here. It may be a big file, but hav ]; services.emacs = { - enable = true; + enable = false; package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); }; diff --git a/flake.lock b/flake.lock index 9d09a22..83ba3dd 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1663219003, - "narHash": "sha256-g+FkhLtjjWJss6mUkWYxeI1kSd1ytd7gdThm3v2bRuw=", + "lastModified": 1663242403, + "narHash": "sha256-Y0gpc46wE6nqp0Viv6qRK+lCBnwrrqkl3MmDGKVSH4A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e6e2da01c61c6ee0a95ea3ecc2fe4d751caa4554", + "rev": "6d21d47c97f12d1dcb7d1726a9a4ae22aad11442", "type": "github" }, "original": { diff --git a/scripts/upgrade-nix b/scripts/upgrade-nix index d51f1aa..185aabd 100755 --- a/scripts/upgrade-nix +++ b/scripts/upgrade-nix @@ -1,5 +1,5 @@ #!/bin/sh currentdir=$(pwd) cd ~/.dotfiles -nixos-rebuild --use-remote-sudo switch --verbose --flake .# +nixos-rebuild --use-remote-sudo switch --verbose --impure --flake .# cd $currentdir diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index a0b6f62..a5d783e 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -4,6 +4,7 @@ imports = [ ./hardware-configuration.nix + /etc/nixos/cachix.nix ]; nix = { extraOptions = "experimental-features = nix-command flakes"; @@ -62,6 +63,7 @@ }; }; + boot.supportedFilesystems = [ "ntfs" ]; services.xserver = { enable = true; windowManager.awesome = { @@ -169,6 +171,7 @@ git tmux dutree + cachix unzip unrar p7zip @@ -178,6 +181,7 @@ binutils podman-compose exa + # img2pdf yt-dlp bat rsync @@ -295,6 +299,7 @@ element-desktop-wayland scrcpy python + python3 airshipper # hyprland @@ -319,6 +324,7 @@ extra-cmake-modules pkg-config libsForQt5.wrapQtAppsHook + python310Packages.pyqt5 # LIBRARIES FOR DEV qt5.full qt5.qtbase diff --git a/system/syl/cachix.nix b/system/syl/cachix.nix new file mode 100644 index 0000000..ecd2d39 --- /dev/null +++ b/system/syl/cachix.nix @@ -0,0 +1,13 @@ + +# WARN: this file will get overwritten by $ cachix use +{ pkgs, lib, ... }: + +let + folder = ./cachix; + toImport = name: value: folder + ("/" + name); + filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; + imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); +in { + inherit imports; + nix.settings.substituters = ["https://cache.nixos.org/"]; +} diff --git a/system/syl/cachix/nix-community.nix b/system/syl/cachix/nix-community.nix new file mode 100644 index 0000000..9eacfa3 --- /dev/null +++ b/system/syl/cachix/nix-community.nix @@ -0,0 +1,11 @@ + +{ + nix = { + settings.substituters = [ + "https://nix-community.cachix.org" + ]; + settings.trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; +} diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index bbfa2fd..c0e8d8d 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -4,6 +4,7 @@ imports = [ ./hardware-configuration.nix + /etc/nixos/cachix.nix ]; nix = { extraOptions = "experimental-features = nix-command flakes"; @@ -60,6 +61,7 @@ ]; }; + boot.supportedFilesystems = [ "ntfs" ]; services.xserver = { enable = true; windowManager.awesome = { @@ -182,6 +184,7 @@ git tmux dutree + cachix unzip unrar p7zip @@ -191,6 +194,7 @@ binutils podman-compose exa + # img2pdf yt-dlp bat rsync @@ -308,6 +312,7 @@ element-desktop-wayland scrcpy python + python3 airshipper # hyprland @@ -334,6 +339,7 @@ extra-cmake-modules pkg-config libsForQt5.wrapQtAppsHook + python310Packages.pyqt5 # LIBRARIES FOR DEV qt5.full qt5.qtbase @@ -385,7 +391,7 @@ ]; services.emacs = { - enable = true; + enable = false; package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); };