.envrc

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

.gitignore

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

flake.lock

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

flake.nix

@@ -7,8 +7,7 @@
     #       `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/c169763c3087b02a8308e2f8a9bba77c428dcca1"; # userborn
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     disko = {
       url = "github:nix-community/disko";
@@ -103,7 +102,7 @@
         legacyPackages = import ./pkgs pkgs;
 
         ### nix develop
-        devShells.default = pkgs.mkShellNoCC {
+        devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             colmena
             sops

home/applications/direnv/default.nix

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

home/applications/nix/default.nix

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

home/applications/sway/default.nix

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

home/applications/swayidle/default.nix

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

home/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   ...
 }:
@@ -7,26 +6,49 @@
   home = {
     username = "guanranwang";
     homeDirectory = "/home/guanranwang";
-    stateVersion = "24.05";
+    stateVersion = "23.05";
   };
 
-  imports = [
+  imports =
-    ./theme.nix
+    [
-    ./xdg-mime.nix
+      ./theme.nix
-  ] ++ lib.filter (x: lib.hasSuffix "default.nix" x) (lib.fileset.toList ./applications);
+      ./xdg-mime.nix
+    ]
+    ++ 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 = {
+  programs.jq.enable = true;
-    jq.enable = true;
+  programs.obs-studio.enable = true;
-    obs-studio.enable = true;
+  programs.ripgrep.enable = true;
-    ripgrep.enable = true;
+  programs.skim.enable = true;
-    skim.enable = true;
+  programs.zoxide.enable = true;
-    zoxide.enable = true;
-  };
 
   home.packages = with pkgs; [
-    dconf-editor
     fastfetch
     fd
+    dconf-editor
     file-roller
     fractal
     gnome-calculator
@@ -34,4 +56,5 @@
     loupe
     seahorse
   ];
+
 }

hosts/dust/default.nix

@@ -21,13 +21,6 @@
   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,6 +17,7 @@
     "befs"
     "cramfs"
     "efs"
+    "erofs"
     "exofs"
     "freevxfs"
     "f2fs"