Compare commits
No commits in common. "749d45df3c1e7afaf2ce6c6276cc1629daa7f597" and "5852b1cabd160c62e11ea48c4cf860602870f182" have entirely different histories.
749d45df3c
...
5852b1cabd
11 changed files with 87 additions and 56 deletions
1
.envrc
1
.envrc
|
@ -1 +0,0 @@
|
|||
use flake
|
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -2,5 +2,3 @@ result
|
|||
result-*
|
||||
|
||||
.DS_Store
|
||||
|
||||
/.direnv
|
||||
|
|
|
@ -231,17 +231,17 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1725013374,
|
||||
"narHash": "sha256-fbz8MUVDWHchQSA4uguP9YYDXnX4bEdlP7YvsMcXZu4=",
|
||||
"lastModified": 1724748588,
|
||||
"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"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
colmena
|
||||
deadnix
|
||||
nh
|
||||
nil
|
||||
|
|
|
@ -6,6 +6,14 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
../i3status-rust
|
||||
../kanshi
|
||||
../mako
|
||||
../swayidle
|
||||
../swaylock
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
pwvucontrol
|
||||
|
|
|
@ -1,25 +1,40 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services.swayidle = {
|
||||
imports = [
|
||||
../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 = "/run/current-system/sw/bin/systemctl suspend";
|
||||
command = "systemctl suspend";
|
||||
}
|
||||
];
|
||||
events = [
|
||||
{
|
||||
event = "lock";
|
||||
command = lib.getExe config.programs.swaylock.package;
|
||||
command = lock;
|
||||
}
|
||||
{
|
||||
event = "before-sleep";
|
||||
command = "/run/current-system/systemd/bin/loginctl lock-session";
|
||||
command = lock;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
@ -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
|
||||
] ++ 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;
|
||||
obs-studio.enable = true;
|
||||
ripgrep.enable = true;
|
||||
skim.enable = true;
|
||||
zoxide.enable = true;
|
||||
};
|
||||
programs.jq.enable = true;
|
||||
programs.obs-studio.enable = true;
|
||||
programs.ripgrep.enable = true;
|
||||
programs.skim.enable = true;
|
||||
programs.zoxide.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
dconf-editor
|
||||
fastfetch
|
||||
fd
|
||||
dconf-editor
|
||||
file-roller
|
||||
fractal
|
||||
gnome-calculator
|
||||
|
@ -34,4 +56,5 @@
|
|||
loupe
|
||||
seahorse
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
"befs"
|
||||
"cramfs"
|
||||
"efs"
|
||||
"erofs"
|
||||
"exofs"
|
||||
"freevxfs"
|
||||
"f2fs"
|
||||
|
|
Loading…
Reference in a new issue