changes for iso and such

anna328p · Sep 18, 2024 · 402b864 · 402b864
1 parent dc61244
commit 402b864
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 47 deletions.
diff --git a/common/base/hardware.nix b/common/base/hardware.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
     boot = {
-        tmp.useTmpfs = true;
-        initrd.systemd.enable = true;
+        tmp.useTmpfs = lib.mkDefault true;
+        initrd.systemd.enable = lib.mkDefault true;
     };
 
     system.etc.overlay = {
-        enable = true;
+        enable = lib.mkDefault true;
 
         # mutable = false;
         # TODO: broken by nixpkgs#328926

diff --git a/common/base/users.nix b/common/base/users.nix
@@ -43,7 +43,7 @@
         };
 
         users.root = {
-            initialHashedPassword = passwdHash;
+            initialHashedPassword = lib.mkDefault passwdHash;
             openssh.authorizedKeys.keys = [ sshPubKey ];
         };
     };

diff --git a/common/impermanent/home.nix b/common/impermanent/home.nix
@@ -23,6 +23,7 @@
                 ".config/discord"
                 ".config/easyeffects"
                 ".config/keepassxc"
+                ".config/github-copilot"
 
                 ".config/Logseq"
                 ".logseq"

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -26,10 +26,11 @@
 
         # android
 
-        nix-on-droid = {
-            url = github:nix-community/nix-on-droid;
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
+        nix-on-droid.url = github:nix-community/nix-on-droid;
+        nix-on-droid.inputs = {
+            nixpkgs.follows = "nixpkgs";
+            nixpkgs-docs.follows = "nixpkgs";
+            home-manager.follows = "home-manager";
         };
 
         # modules
@@ -38,6 +39,12 @@
         impermanence.url = github:nix-community/impermanence;
         intransience.url = github:anna328p/intransience;
 
+        nixos-generators.url = github:nix-community/nixos-generators;
+        nixos-generators.inputs = {
+            nixpkgs.follows = "nixpkgs";
+            nixlib.follows = "nixpkgs";
+        };
+
         nix-colors.url = github:misterio77/nix-colors;
         nix-colors.inputs.nixpkgs-lib.follows = "nixpkgs";
 
@@ -46,25 +53,20 @@
 
         qbot.url = github:arch-community/qbot;
 
-        snm = {
-            url = gitlab:simple-nixos-mailserver/nixos-mailserver;
-            inputs = {
-                nixpkgs.follows = "nixpkgs";
-                nixpkgs-24_05.follows = "nixpkgs";
-                flake-compat.follows = "flake-compat";
-            };
+        snm.url = gitlab:simple-nixos-mailserver/nixos-mailserver;
+        snm.inputs = {
+            nixpkgs.follows = "nixpkgs";
+            nixpkgs-24_05.follows = "nixpkgs";
+            flake-compat.follows = "flake-compat";
         };
 
         # packages
 
-        neovim-nightly-overlay = {
-            url = github:nix-community/neovim-nightly-overlay;
-
-            inputs = {
-                nixpkgs.follows = "nixpkgs";
-                flake-parts.follows = "flake-parts";
-                flake-compat.follows = "flake-compat";
-            };
+        neovim-nightly-overlay.url = github:nix-community/neovim-nightly-overlay;
+        neovim-nightly-overlay.inputs = {
+            nixpkgs.follows = "nixpkgs";
+            flake-parts.follows = "flake-parts";
+            flake-compat.follows = "flake-compat";
         };
 
         nil.url = github:oxalica/nil;
@@ -85,6 +87,9 @@
         nvim-treesitter.url = github:nvim-treesitter/nvim-treesitter;
         nvim-treesitter.flake = false;
 
+        copilot-lualine.url = github:AndreM222/copilot-lualine;
+        copilot-lualine.flake = false;
+
         easyeffects-presets.url = github:digitalone1/easyeffects-presets;
         easyeffects-presets.flake = false;
 
@@ -112,9 +117,10 @@
         , nil
         , nix-prelude
         , nix-on-droid
+        , nixos-generators
         , ...
     }@flakes: let
-        localPkgs = import ./pkgs flakes;
+        localPkgs = import ./pkgs { inherit flakes; };
 
         ##
         # Module paths
@@ -150,6 +156,8 @@
                 angelia = systems/angelia;
                 heracles = systems/heracles;
                 iris = systems/iris;
+
+                iso = systems/iso;
             };
         };
 
@@ -260,7 +268,11 @@
                 overlays = [ self.overlays.default ];
             };
         in
-            localPkgs.mkPackageSet pkgs
+            (localPkgs.mkPackageSet pkgs)
+            // {
+                iso-x86_64 = import ./images/iso-x86_64
+                    { inherit pkgs flakes specialArgs; };
+            }
         );
     };
 }
diff --git a/home/workstation/editor.nix b/home/workstation/editor.nix
@@ -163,11 +163,15 @@
                 (CallFrom (Require "gitsigns") "setup" { })
             ]) { })
 
+            v.copilot-lualine
+
             (luaPlugin v.lualine-nvim (Code [
                 (CallFrom (Require "lualine") "setup" {
                     options = {
                         icons_enabled = false;
                         theme = "base16";
+
+                        sections.lualine_y = [ "copilot" "progress" ];
                     };
                  })
             ]) { })
@@ -268,9 +272,9 @@
                     gemCmd = exe: test: args: [
                         "bash"
                         "-c"
-                        ("bundle exec steep --version"
-                            + " && exec bundle exec steep langserver"
-                            + " || exec steep langserver")
+                        ("bundle exec ${exe} ${test}"
+                            + " && exec bundle exec ${exe} ${args}"
+                            + " || exec ${exe} ${args}")
                     ];
 
                     rubyLS = name: cmd: extra:
@@ -314,6 +318,7 @@
                     single_file_support = true;
                 })
 
+                # make nil-ls a semanticTokensProvider
                 (Call <vim.api.nvim_create_autocmd> [ "LspAttach" {
                     callback = Function ({ args }: [
                         (SetLocal <cid>
@@ -328,6 +333,10 @@
                                     "semanticTokensProvider" ])
                                 null) ])]);
                 } ])
+
+                # code action keybind to alt+enter
+                (Call <vim.keymap.set> [ "n" "<M-CR>"
+                    <vim.lsp.buf.code_action> ])
             ]) { })
 
             (let

diff --git a/images/iso-x86_64/default.nix b/images/iso-x86_64/default.nix
@@ -0,0 +1,13 @@
+{ flakes, specialArgs, ... }:
+
+flakes.nixos-generators.nixosGenerate {
+    system = "x86_64-linux";
+
+    modules = [
+        ../../systems/iso
+    ];
+
+    inherit specialArgs;
+
+    format = "install-iso";
+}
diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
@@ -10,4 +10,6 @@ in {
     keydb = callPackage' ./keydb { };
 
     neovim-ruby-env = callPackage' ./neovim-ruby-env { };
+
+    iso-x86_64 = callPackage' ./iso-x86_64 { };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -1,6 +1,8 @@
-{ nixpkgs, ... }@flakes:
+{ flakes }:
 
 let
+    inherit (flakes) nixpkgs;
+
     truncateRev = builtins.substring 0 7;
 
     mkFlakeVer = flake: prefix:

diff --git a/pkgs/overlays/vim/default.nix b/pkgs/overlays/vim/default.nix
@@ -37,5 +37,6 @@ in {
         } // buildPluginsFrom flakes [
             "vim-slim"
             "rainbow-delimiters-nvim"
+            "copilot-lualine"
         ]);
 }
diff --git a/systems/iso/default.nix b/systems/iso/default.nix
@@ -0,0 +1,21 @@
+{ localModules, ... }:
+
+{
+    imports = let
+        inherit (localModules) common;
+    in [
+        common.base
+        common.physical
+    ];
+
+    networking.hostName = "nixos-iso";
+
+    services.openssh.enable = true;
+
+    misc.uuid = "b210a256-c9d0-4c44-a658-28ce6fe204b7";
+
+    boot.initrd.systemd.enable = false;
+    system.etc.overlay.enable = false;
+
+    time.timeZone = "Etc/UTC";
+}