diff options
Diffstat (limited to 'flake')
| -rw-r--r-- | flake/apps/default.nix | 23 | ||||
| -rw-r--r-- | flake/default.nix | 147 | ||||
| -rw-r--r-- | flake/nixosConfigurations/common.nix | 122 | ||||
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 91 | ||||
| -rw-r--r-- | flake/packages/default.nix | 98 | ||||
| -rw-r--r-- | flake/treefmt.nix | 86 |
6 files changed, 0 insertions, 567 deletions
diff --git a/flake/apps/default.nix b/flake/apps/default.nix deleted file mode 100644 index f1709c71..00000000 --- a/flake/apps/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - self, - system, - ... -}: { - install = { - type = "app"; - program = "${self.packages."${system}".install}/bin/install"; - }; - activate = { - type = "app"; - program = "${self.packages."${system}".activate}/bin/activate"; - }; - setup = { - type = "app"; - program = "${self.packages."${system}".setup}/bin/setup"; - }; - config_setup = { - type = "app"; - program = "${self.packages."${system}".config_setup}/bin/config_setup"; - }; - default = self.apps."${system}".activate; -} diff --git a/flake/default.nix b/flake/default.nix deleted file mode 100644 index be6d2b70..00000000 --- a/flake/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - # core - self, - pkgs, - pkgsStable, - nixLib, - myPkgs, - system, - sysLib, - nixpkgs_as_input, - nixpkgs_open_prs, - # modules - home-manager, - nixVim, - nixos-generators, - impermanence, - agenix, - ragenix, - serverphone, - disko, - lanzaboote, - nix-index-database, - # external dependencies - user_js, - treefmt-nix, - templates, - # my binaries - shell_library, - river_init_lesser, - qmk_firmware, -}: let - treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; - - nixosConfigurations = import ./nixosConfigurations { - inherit - self - pkgsStable - myPkgs - system - nixpkgs_as_input - nixpkgs_open_prs - # my things - shell_library - sysLib - nixLib - templates - # modules - home-manager - nixVim - nixos-generators - impermanence - agenix - ragenix - serverphone - disko - lanzaboote - nix-index-database - # bins - river_init_lesser - qmk_firmware - # external - user_js - ; - }; - - tests = import ../tests { - inherit pkgs nixpkgs_as_input myPkgs sysLib nixLib; - inherit (pkgs) lib; - extraModules = { - termfilechooser = "${nixpkgs_open_prs.nixpkgs-tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix"; - - nixvim = { - homeManagerModule = nixVim.homeManagerModules.nixvim; - }; - agenix = agenix.nixosModules.default; - disko = disko.nixosModules.default; - serverphone = serverphone.nixosModules.default; - inherit (home-manager.nixosModules) home-manager; - inherit (impermanence.nixosModules) impermanence; - inherit (lanzaboote.nixosModules) lanzaboote; - }; - }; -in { - inherit nixosConfigurations; - checks."${system}" = - nixLib.warnMerge { - inherit - (self.packages."${system}") - nvim - ; - formatting = treefmtEval.config.build.check self; - } - tests "flake checks"; - - # legacyPackages."${system}" = pkgs; - - packages."${system}" = import ./packages { - inherit - nixos-generators - pkgs - pkgsStable - myPkgs - sysLib - system - nixVim - self - shell_library - ; - inherit (pkgs) lib; - }; - - formatter."${system}" = treefmtEval.config.build.wrapper; - - apps."${system}" = import ./apps {inherit self system;}; - - devShells."${system}" = { - default = pkgs.mkShell { - packages = [ - # secure boot - pkgs.sbctl - - # other - pkgs.cocogitto - pkgs.git-bug - - # secrets - ragenix.packages."${system}".default - pkgs.rage - - # shell - pkgs.shfmt - - # rust - pkgs.rustfmt - pkgs.cargo - - # nix - pkgs.alejandra - - # update - myPkgs.generate_moz_extension # needed for the firefox extension update script - myPkgs.lf-make-map # needed to generate the lf cd mappings - myPkgs.update-vim-plugins - ]; - }; - }; -} diff --git a/flake/nixosConfigurations/common.nix b/flake/nixosConfigurations/common.nix deleted file mode 100644 index b8601c75..00000000 --- a/flake/nixosConfigurations/common.nix +++ /dev/null @@ -1,122 +0,0 @@ -# This file contains common configuration applied to every host. -# It should only `enable` options defined in the `modules/by-name` directory. -{ - config, - pkgs, - ... -}: { - soispha = { - boot.enable = true; - cleanup.enable = true; - documentation.enable = true; - - fonts = { - enable = true; - enableEmoji = true; - }; - - home-manager.enable = true; - impermanence = { - enable = true; - - directories = [ - "/etc/nixos" - "/var/log" - "/var/lib/systemd" - "/var/lib/nixos" - ]; - }; - polkit.enable = true; - power.enable = true; - - services = { - adb = { - enable = true; - user = "soispha"; - }; - fwupd.enable = true; - mpd = { - enable = true; - directories = let - data = "${config.home-manager.users.soispha.xdg.dataHome}/mpd"; - in { - inherit data; - playlists = "${data}/playlists"; - runtime = "/run/user/${builtins.toString config.users.users.soispha.uid}/mpd"; - music = config.home-manager.users.soispha.programs.beets.settings.directory; - }; - mpc = { - enable = true; - beetsPkg = config.home-manager.users.soispha.programs.beets.package; - }; - }; - ollama.enable = false; - postgresql.enable = false; - printing.enable = true; - scanning.enable = true; - snapper.enable = true; - steam.enable = false; - systemDiff.enable = true; - unison = { - enable = true; - - foreign.userName = "soispha"; - dataDir = "${config.home-manager.users.soispha.xdg.dataHome}/unison"; - userSourceDir = "/srv/home/soispha"; - pathsToIgnore = let - extractTarget = attr: "~/${attr.target}"; - homeManagerSymlinks = - builtins.map extractTarget - (builtins.attrValues - config.home-manager.users.soispha.home.file); - in - [ - # already synchronized by the taskserver - "~/.local/share/task" - - # Should not be synchronized - "~/.local/share/unison" - - # Is just to big to be synchronized (# TODO: Work around that <2024-08-31> ) - "~/media/music" - ] - ++ homeManagerSymlinks; - - pathsToSync = [ - "~/.local/state/mpv" - "~/.local/state/nvim" - "~/.local/share" - "~/.local/.Trash-1000" - - "~/.mozilla/.Trash-1000" - "~/.mozilla/firefox" - - "~/media" - "~/school" - "~/repos" - ]; - }; - }; - - programs = { - nvim = { - enable = true; - shell = pkgs.zsh; - }; - atuin.enable = true; - git.enable = true; - imv.enable = true; - less.enable = true; - lf.enable = true; - river.enable = true; - taskwarrior.enable = true; - yambar.enable = true; - yt.enable = true; - zathura.enable = true; - zsh.enable = true; - }; - - sound.enable = true; - version.enable = true; - }; -} diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix deleted file mode 100644 index b0a02580..00000000 --- a/flake/nixosConfigurations/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - self, - system, - pkgsStable, - myPkgs, - nixpkgs_as_input, - nixpkgs_open_prs, - # my things - shell_library, - sysLib, - nixLib, - templates, - # modules - home-manager, - nixVim, - nixos-generators, - impermanence, - agenix, - ragenix, - serverphone, - disko, - lanzaboote, - nix-index-database, - # bins - river_init_lesser, - qmk_firmware, - # external - user_js, -}: let - modules = [ - "${nixpkgs_open_prs.nixpkgs-tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix" - - agenix.nixosModules.default - disko.nixosModules.default - home-manager.nixosModules.home-manager - impermanence.nixosModules.impermanence - lanzaboote.nixosModules.lanzaboote - serverphone.nixosModules.default - - ../../modules - ./common.nix - ]; - - specialArgs = { - inherit - # extra package sources - nixpkgs_open_prs - pkgsStable - myPkgs - shell_library - sysLib - nixLib - # extra information - system - # modules - impermanence - nix-index-database - nixVim - # nix registry - nixpkgs_as_input - self - templates - # bins - # TODO: Integrate these into `pkgs/by-name` <2024-05-22> - river_init_lesser - qmk_firmware - serverphone - # external deps - user_js - ; - }; - - generateHost = name: { - name = "${name}"; - value = nixpkgs_as_input.lib.nixosSystem { - inherit specialArgs; - modules = - [ - ../../hosts/${name} - ] - ++ modules; - }; - }; - - # FIXME: These need to stay in this position for the install script - hosts = ["tiamat" "apzu"]; - inactiveHosts = ["mammun" "lahmu"]; - - generatedHosts = builtins.listToAttrs (builtins.map generateHost hosts); -in - generatedHosts diff --git a/flake/packages/default.nix b/flake/packages/default.nix deleted file mode 100644 index a8fc2d64..00000000 --- a/flake/packages/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - self, - nixos-generators, - pkgs, - myPkgs, - pkgsStable, - sysLib, - nixVim, - system, - shell_library, - ... -}: let - inherit (pkgs) lib; - output = import ../../bootstrap {inherit pkgs sysLib;}; - - run_test_description = pkgs.callPackage ../../tests/infrastructure/run.nix {}; - - nvim = - builtins.mapAttrs ( - name: value: let - config = value.config.home-manager.users.soispha.programs.nixvim; - - # NOTE: This is copied from `nixvim`, and could be achieved by setting - # `config.wrapRc` to `true`. But I have yet to find a way to set this in this - # context, but not in the general context. <2024-11-09> - wrapped = config.build.package.override (prev: { - wrapperArgs = - ( - if lib.isString prev.wrapperArgs - then prev.wrapperArgs - else lib.escapeShellArgs prev.wrapperArgs - ) - + " " - + ''--add-flags -u --add-flags "${config.build.initFile}"''; - wrapRc = false; - }); - in - wrapped - ) - self.nixosConfigurations; - - output_neovim = lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair "nvim_${name}" value) nvim; - - myPkgsFlat = - builtins.listToAttrs - # Filter out the `override` and `overrideDerivation` functions - (builtins.filter ({ - name, - value, - }: - lib.attrsets.isDerivation value) (lib.lists.flatten - ( - lib.attrsets.mapAttrsToList (name: value: - if lib.attrsets.isDerivation value - then [ - { - inherit name value; - } - ] - else - lib.attrsets.mapAttrsToList (name: value: { - inherit name value; - }) - value) - myPkgs - ))); - - firefox = (import ../../modules/home.legacy/conf/firefox/scripts) {inherit pkgs sysLib;}; -in - { - # install-iso = nixos-generators.nixosGenerate { - # system = "x86_64-linux"; - # specialArgs = defaultSpecialArgs; - # modules = [ - # ../../hosts/marduk - # ]; - # format = "install-iso"; - # }; - - update_shell_lib = shell_library.packages."${system}".update_shell_library; - - # gpg-iso = nixos-generators.nixosGenerate { - # system = "x86_64-linux"; - # specialArgs = defaultSpecialArgs; - # modules = - # [ - # ../../hosts/isimud - # ] - # ++ defaultModules; - # format = "iso"; - # }; - nvim = nvim.tiamat; - inherit run_test_description; - } - // output - // output_neovim - // firefox - // myPkgsFlat diff --git a/flake/treefmt.nix b/flake/treefmt.nix deleted file mode 100644 index e2c6aeae..00000000 --- a/flake/treefmt.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - treefmt-nix, - pkgs, -}: -treefmt-nix.lib.evalModule pkgs ( - {pkgs, ...}: { - # Used to find the project root - projectRootFile = "flake.nix"; - - programs = { - alejandra.enable = true; - rustfmt.enable = true; - clang-format.enable = true; - mdformat.enable = true; - shfmt = { - enable = true; - indent_size = 4; - }; - shellcheck.enable = true; - prettier = { - settings = { - arrowParens = "always"; - bracketSameLine = false; - bracketSpacing = true; - editorconfig = true; - embeddedLanguageFormatting = "auto"; - endOfLine = "lf"; - # experimentalTernaries = false; - htmlWhitespaceSensitivity = "css"; - insertPragma = false; - jsxSingleQuote = true; - printWidth = 80; - proseWrap = "always"; - quoteProps = "consistent"; - requirePragma = false; - semi = true; - singleAttributePerLine = true; - singleQuote = true; - trailingComma = "all"; - useTabs = false; - vueIndentScriptAndStyle = false; - - tabWidth = 4; - overrides = { - files = ["*.js"]; - options.tabwidth = 2; - }; - }; - }; - stylua = { - enable = true; - settings = { - sort_requires.enabled = true; - column_width = 120; - line_endings = "Unix"; - indent_type = "Spaces"; - indent_width = 2; - quote_style = "ForceDouble"; - call_parentheses = "Always"; - # space_after_function_names = "Never"; - collapse_simple_statement = "Always"; - }; - }; - ruff = { - enable = true; - format = true; - }; - taplo.enable = true; - }; - - settings = { - global.excludes = [ - "CHANGELOG.md" - "NEWS.md" - ]; - formatter = { - clang-format = { - options = ["--style" "GNU"]; - }; - shfmt = { - includes = ["*.bash"]; - }; - }; - }; - } -) |
