various updates

anna328p · Aug 31, 2024 · 9ac403c · 9ac403c
1 parent 0ba485e
commit 9ac403c
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 83 deletions.
diff --git a/.github/workflows/build-systems.yml b/.github/workflows/build-systems.yml
@@ -0,0 +1,20 @@
+name: Build systems
+on:
+  pull_request:
+  push:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: cachix/install-nix-action@v27
+
+      - uses: cachix/cachix-action@v15
+        with:
+          name: anna328p
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
+      - run: nix flake update keydb
+      - run: nix build 'path:.#nixosConfigurations.hermes.config.system.build.toplevel'
+      - run: echo 'OK'
diff --git a/common/base/default.nix b/common/base/default.nix
@@ -67,11 +67,6 @@
                 source = "/etc/zoneinfo/${config.time.timeZone}";
                 mode = lib.mkForce "symlink";
             };
-
-            mtab = {
-                source = "/proc/mounts";
-                mode = "symlink";
-            };
         };
     };
 

diff --git a/common/workstation/apps-extra.nix b/common/workstation/apps-extra.nix
@@ -60,7 +60,6 @@ in {
         p.woeusb         # Write Windows install disks
         p.idevicerestore # Flash Apple devices
         p.anki           # Flashcards
-        p.appimage-run
         p.gnome-decoder  # Scan QR codes from screenshots
     ];
 

diff --git a/common/workstation/apps.nix b/common/workstation/apps.nix
@@ -48,9 +48,12 @@
         p.espeak-ng # TTS
     ];
 
-    # Logseq 0.10 dep
     # TODO: Remove
     nixpkgs.config.permittedInsecurePackages = [
+        # Logseq 0.10 dep
         "electron-27.3.11"
+
+        # nheko dep
+        "olm-3.2.16"
     ];
 }
diff --git a/common/workstation/gui.nix b/common/workstation/gui.nix
@@ -36,7 +36,7 @@
         p.libjxl-with-plugins
 
         # GNOME addons
-        g.gnome-sound-recorder p.gnome-tweaks g.gnome-music
+        p.gnome-sound-recorder p.gnome-tweaks p.gnome-music
 
         # GNOME extensions
         e.brightness-control-using-ddcutil

diff --git a/common/workstation/hw-support.nix b/common/workstation/hw-support.nix
@@ -8,7 +8,7 @@
 
         # Control connected monitors' settings
         kernelModules = [ "i2c-dev" "ddcci" ];
-        extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
+        #extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
     };
 
     environment.systemPackages = let p = pkgs; in [

diff --git a/common/workstation/programs.nix b/common/workstation/programs.nix
@@ -4,20 +4,19 @@
     # flatpak
     services.flatpak.enable = true;
 
-    # gpg agent
     programs = {
-        gnupg.agent = {
-            enable = true;
-            enableSSHSupport = true;
-        };
-
-        less.lessopen = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; # default
-
         nix-index = {
             enable = true;
             enableZshIntegration = true;
         };
 
-        git.package = pkgs.gitFull;
+        git.package = if config.misc.buildFull
+            then pkgs.gitFull
+            else pkgs.gitMinimal;
+
+        appimage = {
+            enable = config.misc.buildFull;
+            binfmt = config.misc.buildFull;
+        };
     };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/home/workstation/default.nix b/home/workstation/default.nix
@@ -1,4 +1,4 @@
-{ flakes, lib, systemConfig, ... }:
+{ flakes, lib, ... }:
 
 {
     imports = [
@@ -9,6 +9,8 @@
         ./git.nix
         ./editor.nix
 
+        ./programs.nix
+
         ./dconf
         ./theming
 
@@ -31,9 +33,5 @@
         createDirectories = true;
     };
 
-    services.fluidsynth.enable = systemConfig.misc.buildFull;
-
-    programs.obs-studio.enable = systemConfig.misc.buildFull;
-
     manual.manpages.enable = lib.mkForce true;
 }
diff --git a/home/workstation/git.nix b/home/workstation/git.nix
@@ -1,29 +1,36 @@
 { pkgs, ... }:
 
 {
-    programs.git = {
-        package = pkgs.gitAndTools.gitFull;
+    programs = {
+        git = {
+            package = pkgs.gitAndTools.gitFull;
 
-        userName = "Anna Kudriavtsev";
-        userEmail = "anna328p@gmail.com";
+            userName = "Anna Kudriavtsev";
+            userEmail = "anna328p@gmail.com";
 
-        ignores = [
-            ".ccls_cache"
-            ".direnv"
-        ];
-    };
+            ignores = [
+                ".ccls_cache"
+                ".direnv"
+            ];
+        };
 
-    xdg.configFile = {
-        "gh/config.yml".text = builtins.toJSON {
-            version = "1";
-            editor = "";
-            git_protocol = "ssh";
+        gh = {
+            enable = true;
+
+            settings = {
+                editor = "";
+                git_protocol = "ssh";
 
-            aliases = {
-                rc = "repo create";
+                aliases = {
+                    rc = "repo create";
+                };
             };
         };
 
+        gh-dash.enable = true;
+    };
+
+    xdg.configFile = {
         # gh/hosts.yml is the credential store for gh.
         # For ssh key auth, gh defers to ssh to find keys, so this file
         # contains no secrets and can be generated declaratively.