home: add direnv

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -2,3 +2,5 @@ result
 result-*
 
 .DS_Store
+
+/.direnv

flake.lock

@@ -231,17 +231,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724748588,
+        "lastModified": 1725013374,
-        "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=",
+        "narHash": "sha256-fbz8MUVDWHchQSA4uguP9YYDXnX4bEdlP7YvsMcXZu4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99",
+        "rev": "c169763c3087b02a8308e2f8a9bba77c428dcca1",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
+        "rev": "c169763c3087b02a8308e2f8a9bba77c428dcca1",
         "type": "github"
       }
     },

flake.nix

@@ -7,7 +7,8 @@
     #       `nixpkgs-unstable` contains less(?) jobs, and usually updates faster.
     #
     # REFERENCE: https://discourse.nixos.org/t/differences-between-nix-channels/13998/5
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/c169763c3087b02a8308e2f8a9bba77c428dcca1"; # userborn
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     disko = {
       url = "github:nix-community/disko";
@@ -102,7 +103,7 @@
         legacyPackages = import ./pkgs pkgs;
 
         ### nix develop
-        devShells.default = pkgs.mkShell {
+        devShells.default = pkgs.mkShellNoCC {
           packages = with pkgs; [
             colmena
             sops

home/applications/direnv/default.nix

@@ -0,0 +1,6 @@
+{
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+}

home/applications/nix/default.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    colmena
     deadnix
     nh
     nil

home/applications/sway/default.nix

@@ -6,14 +6,6 @@
   ...
 }:
 {
-  imports = [
-    ../i3status-rust
-    ../kanshi
-    ../mako
-    ../swayidle
-    ../swaylock
-  ];
-
   home.packages = with pkgs; [
     wl-clipboard
     pwvucontrol

home/applications/swayidle/default.nix

@@ -1,40 +1,25 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 {
-  imports = [
+  services.swayidle = {
-    ../swaylock
-  ];
-
-  services.swayidle =
-    let
-      lock = lib.getExe config.programs.swaylock.package;
-      brightness = lib.getExe pkgs.brightnessctl;
-    in
-    {
     enable = true;
     timeouts = [
-        {
-          timeout = 60 * 9;
-          command = "${brightness} -s set 20%";
-          resumeCommand = "${brightness} -r";
-        }
       {
         timeout = 60 * 10;
-          command = "systemctl suspend";
+        command = "/run/current-system/sw/bin/systemctl suspend";
       }
     ];
     events = [
       {
         event = "lock";
-          command = lock;
+        command = lib.getExe config.programs.swaylock.package;
       }
       {
         event = "before-sleep";
-          command = lock;
+        command = "/run/current-system/systemd/bin/loginctl lock-session";
       }
     ];
   };

home/default.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   ...
 }:
@@ -6,49 +7,26 @@
   home = {
     username = "guanranwang";
     homeDirectory = "/home/guanranwang";
-    stateVersion = "23.05";
+    stateVersion = "24.05";
   };
 
-  imports =
+  imports = [
-    [
     ./theme.nix
     ./xdg-mime.nix
-    ]
+  ] ++ lib.filter (x: lib.hasSuffix "default.nix" x) (lib.fileset.toList ./applications);
-    ++ map (n: ./applications/${n}) [
-      "atuin"
-      "bash"
-      "bat"
-      "eza"
-      "fcitx5"
-      "firefox"
-      "fish"
-      "foot"
-      "git"
-      "go"
-      "gpg"
-      "mpv"
-      "nautilus"
-      "neovim"
-      "nix"
-      "ssh"
-      "starship"
-      "sway"
-      "tealdeer"
-      "thunderbird"
-      "tmux"
-      "ydict"
-    ];
 
-  programs.jq.enable = true;
+  programs = {
-  programs.obs-studio.enable = true;
+    jq.enable = true;
-  programs.ripgrep.enable = true;
+    obs-studio.enable = true;
-  programs.skim.enable = true;
+    ripgrep.enable = true;
-  programs.zoxide.enable = true;
+    skim.enable = true;
+    zoxide.enable = true;
+  };
 
   home.packages = with pkgs; [
+    dconf-editor
     fastfetch
     fd
-    dconf-editor
     file-roller
     fractal
     gnome-calculator
@@ -56,5 +34,4 @@
     loupe
     seahorse
   ];
-
 }

hosts/dust/default.nix

@@ -21,6 +21,13 @@
   time.timeZone = "Asia/Shanghai";
   system.stateVersion = "24.05";
 
+  # TODO: move to 'core' profile
+  system.etc.overlay.enable = true;
+  services.userborn.enable = true;
+
+  # TODO: this is currently broken
+  # system.etc.overlay.mutable = false;
+
   users.users = {
     "guanranwang" = {
       isNormalUser = true;

nixos/profiles/core/hardening.nix

@@ -17,7 +17,6 @@
     "befs"
     "cramfs"
     "efs"
-    "erofs"
     "exofs"
     "freevxfs"
     "f2fs"