Skip to content

Commit 96f859d

Browse files
stephen-huanstephen-huan
committed
chore: fix lint warnings
1 parent b0700e3 commit 96f859d

File tree

5 files changed

+134
-129
lines changed

5 files changed

+134
-129
lines changed

Diff for: ‎config/home-manager/home.nix

+115-113
Original file line numberDiff line numberDiff line change
@@ -8,131 +8,133 @@
88
# You should not change this value, even if you update Home Manager. If you do
99
# want to update the value, then make sure to first check the Home Manager
1010
# release notes.
11-
home.stateVersion = "23.05"; # Please read the comment before changing.
11+
home = {
12+
stateVersion = "23.05"; # Please read the comment before changing.
1213

13-
# The home.packages option allows you to install Nix packages into your
14-
# environment.
15-
home.packages = [
16-
pkgs.alass
17-
pkgs.android-tools
18-
pkgs.caffeine-ng
19-
pkgs.chromium
20-
pkgs.cider
21-
pkgs.clipster
22-
pkgs.cmus
23-
pkgs.du-dust
24-
pkgs.git-credential-manager
25-
pkgs.gpick
26-
pkgs.htop
27-
pkgs.hwinfo
28-
pkgs.ipaexfont
29-
pkgs.ipafont
30-
pkgs.jq
31-
pkgs.krita
32-
pkgs.llvmPackages_latest.libstdcxxClang
33-
pkgs.mdbook
34-
pkgs.mdbook-katex
35-
pkgs.mupdf
36-
pkgs.ncdu
37-
pkgs.neofetch
38-
pkgs.nodejs
39-
pkgs.nodePackages.node2nix
40-
pkgs.nodePackages.prettier
41-
pkgs.noto-fonts
42-
pkgs.noto-fonts-cjk-sans
43-
pkgs.noto-fonts-cjk-serif
44-
pkgs.noto-fonts-emoji
45-
pkgs.noto-fonts-lgc-plus
46-
pkgs.pandoc
47-
pkgs.pass
48-
pkgs.passExtensions.pass-otp
49-
pkgs.pulsemixer
50-
pkgs.ranger
51-
pkgs.shellcheck
52-
(
53-
# temporarily override until new version
54-
pkgs.signal-desktop.override {
55-
version = "6.34.0";
56-
hash = "sha256-YsmXzorTYyydFcXME6GUxn/oaVosVfnCUjAurmlK+x8=";
57-
}
58-
)
59-
pkgs.silver-searcher
60-
pkgs.texlive.combined.scheme-full
61-
pkgs.tokei
62-
pkgs.unzip
63-
pkgs.vulnix
64-
pkgs.xclip
65-
pkgs.xlayoutdisplay
66-
pkgs.yacreader
67-
pkgs.yadm
68-
pkgs.yubikey-manager
69-
pkgs.zathura
70-
pkgs.zbar
71-
pkgs.zip
72-
pkgs.zotero
14+
# The home.packages option allows you to install Nix packages into your
15+
# environment.
16+
packages = [
17+
pkgs.alass
18+
pkgs.android-tools
19+
pkgs.caffeine-ng
20+
pkgs.chromium
21+
pkgs.cider
22+
pkgs.clipster
23+
pkgs.cmus
24+
pkgs.du-dust
25+
pkgs.git-credential-manager
26+
pkgs.gpick
27+
pkgs.htop
28+
pkgs.hwinfo
29+
pkgs.ipaexfont
30+
pkgs.ipafont
31+
pkgs.jq
32+
pkgs.krita
33+
pkgs.llvmPackages_latest.libstdcxxClang
34+
pkgs.mdbook
35+
pkgs.mdbook-katex
36+
pkgs.mupdf
37+
pkgs.ncdu
38+
pkgs.neofetch
39+
pkgs.nodejs
40+
pkgs.nodePackages.node2nix
41+
pkgs.nodePackages.prettier
42+
pkgs.noto-fonts
43+
pkgs.noto-fonts-cjk-sans
44+
pkgs.noto-fonts-cjk-serif
45+
pkgs.noto-fonts-emoji
46+
pkgs.noto-fonts-lgc-plus
47+
pkgs.pandoc
48+
pkgs.pass
49+
pkgs.passExtensions.pass-otp
50+
pkgs.pulsemixer
51+
pkgs.ranger
52+
pkgs.shellcheck
53+
(
54+
# temporarily override until new version
55+
pkgs.signal-desktop.override {
56+
version = "6.34.0";
57+
hash = "sha256-YsmXzorTYyydFcXME6GUxn/oaVosVfnCUjAurmlK+x8=";
58+
}
59+
)
60+
pkgs.silver-searcher
61+
pkgs.texlive.combined.scheme-full
62+
pkgs.tokei
63+
pkgs.unzip
64+
pkgs.vulnix
65+
pkgs.xclip
66+
pkgs.xlayoutdisplay
67+
pkgs.yacreader
68+
pkgs.yadm
69+
pkgs.yubikey-manager
70+
pkgs.zathura
71+
pkgs.zbar
72+
pkgs.zip
73+
pkgs.zotero
7374

74-
pkgs.python311Packages.cython
75+
pkgs.python311Packages.cython
7576

76-
# # It is sometimes useful to fine-tune packages, for example, by applying
77-
# # overrides. You can do that directly here, just don't forget the
78-
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
79-
# # fonts?
80-
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
77+
# # It is sometimes useful to fine-tune packages, for example, by applying
78+
# # overrides. You can do that directly here, just don't forget the
79+
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
80+
# # fonts?
81+
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
8182

82-
# # You can also create simple shell scripts directly inside your
83-
# # configuration. For example, this adds a command 'my-hello' to your
84-
# # environment:
85-
# (pkgs.writeShellScriptBin "my-hello" ''
86-
# echo "Hello, ${config.home.username}!"
87-
# '')
88-
] ++ (import ./unfree.nix pkgs);
83+
# # You can also create simple shell scripts directly inside your
84+
# # configuration. For example, this adds a command 'my-hello' to your
85+
# # environment:
86+
# (pkgs.writeShellScriptBin "my-hello" ''
87+
# echo "Hello, ${config.home.username}!"
88+
# '')
89+
] ++ (import ./unfree.nix pkgs);
8990

90-
# Home Manager is pretty good at managing dotfiles. The primary way to manage
91-
# plain files is through 'home.file'.
92-
home.file = {
93-
".config/ames/config".source = ../ames/config;
91+
# Home Manager is pretty good at managing dotfiles. The primary way to manage
92+
# plain files is through 'home.file'.
93+
file = {
94+
".config/ames/config".source = ../ames/config;
9495

95-
".config/clipster/clipster.ini".text = ''
96-
[clipster]
96+
".config/clipster/clipster.ini".text = ''
97+
[clipster]
9798
98-
# Number of items to save in the history file for each selection.
99-
# 0 - don't save history.
100-
history_size = 0
101-
'';
99+
# Number of items to save in the history file for each selection.
100+
# 0 - don't save history.
101+
history_size = 0
102+
'';
102103

103-
".config/nvim".source = ../nvim/nvim;
104+
".config/nvim".source = ../nvim/nvim;
104105

105-
".config/ranger" = {
106-
source = ../ranger/ranger;
107-
# ranger requires writable config directory
108-
recursive = true;
109-
};
106+
".config/ranger" = {
107+
source = ../ranger/ranger;
108+
# ranger requires writable config directory
109+
recursive = true;
110+
};
110111

111-
".config/black".text = ''
112-
[tool.black]
113-
line-length = 79
114-
'';
112+
".config/black".text = ''
113+
[tool.black]
114+
line-length = 79
115+
'';
115116

116-
".xlayoutdisplay".text = ''
117-
# restrict frame rate to at most 60hz
118-
# tuxedo pulse 15 has problems with 1440p at high refresh rates
119-
rate=60
120-
'';
117+
".xlayoutdisplay".text = ''
118+
# restrict frame rate to at most 60hz
119+
# tuxedo pulse 15 has problems with 1440p at high refresh rates
120+
rate=60
121+
'';
121122

122-
".xprofile".source = ../xprofile/.xprofile;
123-
};
123+
".xprofile".source = ../xprofile/.xprofile;
124+
};
124125

125-
# You can also manage environment variables but you will have to manually
126-
# source
127-
#
128-
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
129-
#
130-
# or
131-
#
132-
# /etc/profiles/per-user/stephenhuan/etc/profile.d/hm-session-vars.sh
133-
#
134-
# if you don't want to manage your shell through Home Manager.
135-
home.sessionVariables = {
136-
# EDITOR = "emacs";
126+
# You can also manage environment variables but you will have to manually
127+
# source
128+
#
129+
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
130+
#
131+
# or
132+
#
133+
# /etc/profiles/per-user/stephenhuan/etc/profile.d/hm-session-vars.sh
134+
#
135+
# if you don't want to manage your shell through Home Manager.
136+
sessionVariables = {
137+
# EDITOR = "emacs";
138+
};
137139
};
138140
}

Diff for: ‎flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
src = ./.;
5252
doCheck = true;
5353
nativeCheckInputs = [ pkgs.statix ];
54-
checkPhase = "statix check .";
54+
checkPhase = "statix check --config statix.toml";
5555
installPhase = "touch $out";
5656
};
5757
devShells.${system}.default = pkgs.mkShell {

Diff for: ‎nixos/configuration.nix

+16-14
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@
88
boot.initrd.luks.devices.cryptlvm.device =
99
"/dev/disk/by-uuid/5d57809c-d0e9-49e9-939e-f5d68392faf4";
1010
# https://elis.nu/blog/2020/05/nixos-tmpfs-as-root/
11-
fileSystems."/" = {
12-
fsType = "tmpfs";
13-
options = [ "defaults" "size=2G" "mode=755" ];
14-
};
15-
# manually specify because `nixos-generate-config` doesn't pick it up
16-
fileSystems."${config._module.args.persistent}" = {
17-
device = "/dev/VolumeGroup/root";
18-
fsType = "ext4";
19-
neededForBoot = true;
20-
};
21-
# https://nixos.wiki/wiki/Filesystems
22-
fileSystems."/nix" = {
23-
device = "${config._module.args.persistent}/nix";
24-
options = [ "bind" ];
11+
fileSystems = {
12+
"/" = {
13+
fsType = "tmpfs";
14+
options = [ "defaults" "size=2G" "mode=755" ];
15+
};
16+
# manually specify because `nixos-generate-config` doesn't pick it up
17+
${config._module.args.persistent} = {
18+
device = "/dev/VolumeGroup/root";
19+
fsType = "ext4";
20+
neededForBoot = true;
21+
};
22+
# https://nixos.wiki/wiki/Filesystems
23+
"/nix" = {
24+
device = "${config._module.args.persistent}/nix";
25+
options = [ "bind" ];
26+
};
2527
};
2628
# overwrite ./hardware-configuration.nix
2729
swapDevices = lib.mkForce [

Diff for: ‎nixos/users.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ config, pkgs, ... }:
22

33
let
4-
username = config._module.args.username;
4+
inherit (config._module.args) username;
55
password-store = "/home/${username}/.password-store/encryption/tuxedo";
66
in
77
{

Diff for: ‎statix.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ignore = ["hardware-configuration.nix"]

0 commit comments

Comments
 (0)