Compare commits
31 Commits
0f7e3596de
...
d96e3eb02e
Author | SHA1 | Date | |
---|---|---|---|
d96e3eb02e | |||
fb671d1401 | |||
a18188d3b1 | |||
4515ea2e05 | |||
60e1947dd8 | |||
0305fa4683 | |||
84a1f22326 | |||
4cb057109f | |||
51d2863cdc | |||
0c1cd15391 | |||
cef3b04ebd | |||
b9f87ac490 | |||
3b55c26a2c | |||
dcd38e777a | |||
2116f650f7 | |||
00139ef2fe | |||
2af8204750 | |||
cd64244bd8 | |||
4cc68dedea | |||
77fe614b7b | |||
6bbe7f186a | |||
77fc296e9e | |||
807944f182 | |||
97c2779d1b | |||
9d900057f6 | |||
86b545761f | |||
a8a66916f4 | |||
32d68061a5 | |||
94e7e738fb | |||
77cf8d46a3 | |||
b5fb07519c |
@ -1,8 +0,0 @@
|
|||||||
language: generic
|
|
||||||
|
|
||||||
script: bash ./gen-gh-pages/deploy.sh
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
- ENCRYPTION_LABEL: "73e6c870aa87"
|
|
||||||
- COMMIT_AUTHOR_EMAIL: "IvanMalison@gmail.com"
|
|
||||||
- COMMIT_AUTHOR_NAME: "Ivan Malison"
|
|
@ -1,63 +0,0 @@
|
|||||||
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
|
||||||
# The parser is also very primitive, and not human-friendly.
|
|
||||||
htop_version=3.3.0
|
|
||||||
config_reader_min_version=3
|
|
||||||
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
|
||||||
hide_kernel_threads=1
|
|
||||||
hide_userland_threads=1
|
|
||||||
hide_running_in_container=0
|
|
||||||
shadow_other_users=0
|
|
||||||
show_thread_names=0
|
|
||||||
show_program_path=1
|
|
||||||
highlight_base_name=0
|
|
||||||
highlight_deleted_exe=1
|
|
||||||
shadow_distribution_path_prefix=0
|
|
||||||
highlight_megabytes=1
|
|
||||||
highlight_threads=0
|
|
||||||
highlight_changes=0
|
|
||||||
highlight_changes_delay_secs=5
|
|
||||||
find_comm_in_cmdline=1
|
|
||||||
strip_exe_from_cmdline=1
|
|
||||||
show_merged_command=0
|
|
||||||
header_margin=1
|
|
||||||
screen_tabs=0
|
|
||||||
detailed_cpu_time=0
|
|
||||||
cpu_count_from_one=1
|
|
||||||
show_cpu_usage=1
|
|
||||||
show_cpu_frequency=0
|
|
||||||
show_cpu_temperature=0
|
|
||||||
degree_fahrenheit=0
|
|
||||||
update_process_names=0
|
|
||||||
account_guest_in_cpu_meter=0
|
|
||||||
color_scheme=0
|
|
||||||
enable_mouse=1
|
|
||||||
delay=15
|
|
||||||
hide_function_bar=0
|
|
||||||
header_layout=two_50_50
|
|
||||||
column_meters_0=AllCPUs Memory Swap
|
|
||||||
column_meter_modes_0=1 1 1
|
|
||||||
column_meters_1=Tasks LoadAverage Uptime
|
|
||||||
column_meter_modes_1=2 2 2
|
|
||||||
tree_view=0
|
|
||||||
sort_key=48
|
|
||||||
tree_sort_key=46
|
|
||||||
sort_direction=1
|
|
||||||
tree_sort_direction=-1
|
|
||||||
tree_view_always_by_pid=0
|
|
||||||
all_branches_collapsed=0
|
|
||||||
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
|
|
||||||
.sort_key=USER
|
|
||||||
.tree_sort_key=PERCENT_CPU
|
|
||||||
.tree_view_always_by_pid=0
|
|
||||||
.tree_view=0
|
|
||||||
.sort_direction=1
|
|
||||||
.tree_sort_direction=-1
|
|
||||||
.all_branches_collapsed=0
|
|
||||||
screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
|
|
||||||
.sort_key=IO_RATE
|
|
||||||
.tree_sort_key=PID
|
|
||||||
.tree_view_always_by_pid=0
|
|
||||||
.tree_view=0
|
|
||||||
.sort_direction=-1
|
|
||||||
.tree_sort_direction=1
|
|
||||||
.all_branches_collapsed=0
|
|
@ -3331,6 +3331,29 @@ emr (emacs refactor) provides support for refactoring in many programming langua
|
|||||||
(setq lsp-ui-doc-position 'bottom)))))
|
(setq lsp-ui-doc-position 'bottom)))))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
* Utility
|
* Utility
|
||||||
|
** eat
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package eat
|
||||||
|
:preface
|
||||||
|
(progn
|
||||||
|
(defun imalison:avy-eat (arg)
|
||||||
|
(interactive "P")
|
||||||
|
(eat-emacs-mode)
|
||||||
|
(imalison:avy arg)))
|
||||||
|
:bind
|
||||||
|
(:map eat-mode-map
|
||||||
|
("C-c C-k" . eat-semi-char-mode)
|
||||||
|
:map eat-semi-char-mode-map
|
||||||
|
("C-c C-j" . eat-emacs-mode)
|
||||||
|
("C-j" . imalison:avy-eat))
|
||||||
|
:config
|
||||||
|
(progn
|
||||||
|
(setq eat--install-path
|
||||||
|
(file-name-directory
|
||||||
|
(file-truename (imalison:join-paths eat--install-path "eat.el"))))
|
||||||
|
(eat-compile-terminfo)
|
||||||
|
(setq eat-term-shell-integration-directory (imalison:join-paths eat--install-path "integration"))))
|
||||||
|
#+end_src
|
||||||
** term
|
** term
|
||||||
The main thing I do here is restore a bunch of keybindings that are eliminated
|
The main thing I do here is restore a bunch of keybindings that are eliminated
|
||||||
in term-mode. This makes term-mode 1000% more useful
|
in term-mode. This makes term-mode 1000% more useful
|
||||||
@ -3412,6 +3435,12 @@ in term-mode. This makes term-mode 1000% more useful
|
|||||||
term-projectile-switch)
|
term-projectile-switch)
|
||||||
:config
|
:config
|
||||||
(progn
|
(progn
|
||||||
|
(use-package term-manager-eat
|
||||||
|
:demand t
|
||||||
|
:straight
|
||||||
|
(term-manager-eat :type git :files ("term-manager-eat.el")
|
||||||
|
:host github :repo "colonelpanic8/term-manager"))
|
||||||
|
(setq term-projectile-term-manager (term-projectile :build-term 'term-manager-eat-build-term))
|
||||||
(emit-prefix-selector imalison:term
|
(emit-prefix-selector imalison:term
|
||||||
term-projectile-forward
|
term-projectile-forward
|
||||||
term-projectile-create-new)
|
term-projectile-create-new)
|
||||||
@ -4100,7 +4129,12 @@ This also adds syntax highlighting for gradle
|
|||||||
#+END_SRC
|
#+END_SRC
|
||||||
** evil
|
** evil
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package evil :commands (evil-mode))
|
(use-package evil
|
||||||
|
:commands (evil-mode)
|
||||||
|
:config
|
||||||
|
(use-package evil-collection
|
||||||
|
:config
|
||||||
|
(with-eval-after-load 'eat (evil-collection-eat-setup))))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** hackernews
|
** hackernews
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
@ -163,3 +163,8 @@ This makes evil-mode play nice with org-fc
|
|||||||
(use-package org-drill)
|
(use-package org-drill)
|
||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
* Disable wild notifactions
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(setq org-wild-notifier-day-wide-alert-times nil)
|
||||||
|
#+end_src
|
||||||
|
5
dotfiles/emacs.d/snippets/python-mode/ign
Normal file
5
dotfiles/emacs.d/snippets/python-mode/ign
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# -*- mode: snippet -*-
|
||||||
|
# name: ign
|
||||||
|
# key: ign
|
||||||
|
# --
|
||||||
|
# type: ignore
|
5
dotfiles/emacs.d/snippets/python-mode/logg
Normal file
5
dotfiles/emacs.d/snippets/python-mode/logg
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# -*- mode: snippet -*-
|
||||||
|
# name: logg
|
||||||
|
# key: logg
|
||||||
|
# --
|
||||||
|
logger = logging.getLogger(__name__)
|
5
dotfiles/emacs.d/snippets/python-mode/noqa
Normal file
5
dotfiles/emacs.d/snippets/python-mode/noqa
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# -*- mode: snippet -*-
|
||||||
|
# name: 401
|
||||||
|
# key: 401
|
||||||
|
# --
|
||||||
|
# noqa: F401
|
18
nixos/ben.nix
Normal file
18
nixos/ben.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{ pkgs, inputs, config, makeEnable, ... }:
|
||||||
|
makeEnable config "modules.ben" true {
|
||||||
|
home-manager.backupFileExtension = "backup"; # Add this line
|
||||||
|
home-manager.users.ben = {
|
||||||
|
programs.zsh = {
|
||||||
|
enable = true;
|
||||||
|
shellAliases = {
|
||||||
|
l = "ls -CF";
|
||||||
|
la = "ls -A";
|
||||||
|
ll = "ls -lh";
|
||||||
|
lla = "ls -alh";
|
||||||
|
ls = "ls --color=auto";
|
||||||
|
gts = "git status";
|
||||||
|
gtl = "git log";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -98,7 +98,7 @@
|
|||||||
inherit inputs machineNames;
|
inherit inputs machineNames;
|
||||||
makeEnable = (import ../make-enable.nix) nixpkgs.lib;
|
makeEnable = (import ../make-enable.nix) nixpkgs.lib;
|
||||||
mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
|
mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
|
||||||
realUsers = [ "root" "imalison" "kat" "dean" "alex" ];
|
realUsers = [ "root" "imalison" "kat" "dean" "alex" "ben"];
|
||||||
forEachUser = mapValueToKeys realUsers;
|
forEachUser = mapValueToKeys realUsers;
|
||||||
} // specialArgs // (import ../keys.nix);
|
} // specialArgs // (import ../keys.nix);
|
||||||
});
|
});
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
imports = [
|
imports = [
|
||||||
./android.nix
|
./android.nix
|
||||||
./base.nix
|
./base.nix
|
||||||
|
./ben.nix
|
||||||
./cache-server.nix
|
./cache-server.nix
|
||||||
./cache.nix
|
./cache.nix
|
||||||
./code.nix
|
./code.nix
|
||||||
|
@ -86,7 +86,6 @@ makeEnable config "modules.desktop" true {
|
|||||||
vlc
|
vlc
|
||||||
volnoti
|
volnoti
|
||||||
xfce.thunar
|
xfce.thunar
|
||||||
zulip
|
|
||||||
|
|
||||||
# Audio
|
# Audio
|
||||||
picard
|
picard
|
||||||
@ -105,5 +104,6 @@ makeEnable config "modules.desktop" true {
|
|||||||
spotify
|
spotify
|
||||||
tor-browser-bundle-bin
|
tor-browser-bundle-bin
|
||||||
vscode
|
vscode
|
||||||
|
zulip
|
||||||
] else []);
|
] else []);
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,21 @@ with lib;
|
|||||||
done
|
done
|
||||||
fpath+="${pkgs.python-with-my-packages}/lib/python3.11/site-packages/argcomplete/bash_completion.d"
|
fpath+="${pkgs.python-with-my-packages}/lib/python3.11/site-packages/argcomplete/bash_completion.d"
|
||||||
'';
|
'';
|
||||||
|
interactiveShellInit = ''
|
||||||
|
eval "$(register-python-argcomplete prb)"
|
||||||
|
eval "$(register-python-argcomplete prod-prb)"
|
||||||
|
eval "$(register-python-argcomplete railbird)"
|
||||||
|
[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.bash = {
|
||||||
|
interactiveShellInit = ''
|
||||||
|
eval "$(register-python-argcomplete prb)"
|
||||||
|
eval "$(register-python-argcomplete prod-prb)"
|
||||||
|
eval "$(register-python-argcomplete railbird)"
|
||||||
|
[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
|
170
nixos/flake.lock
170
nixos/flake.lock
@ -21,6 +21,30 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"agenix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"darwin": "darwin_2",
|
||||||
|
"home-manager": "home-manager_3",
|
||||||
|
"nixpkgs": [
|
||||||
|
"railbird-secrets",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": "systems_4"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1707830867,
|
||||||
|
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
|
||||||
|
"owner": "ryantm",
|
||||||
|
"repo": "agenix",
|
||||||
|
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ryantm",
|
||||||
|
"repo": "agenix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -43,6 +67,29 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"darwin_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"railbird-secrets",
|
||||||
|
"agenix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1700795494,
|
||||||
|
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lnl7",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -245,6 +292,24 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709126324,
|
||||||
|
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_6": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_7"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685518550,
|
"lastModified": 1685518550,
|
||||||
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||||
@ -259,9 +324,9 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_6": {
|
"flake-utils_7": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_6"
|
"systems": "systems_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1681202837,
|
||||||
@ -536,7 +601,7 @@
|
|||||||
"haskell-language-server_2": {
|
"haskell-language-server_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_4",
|
"flake-compat": "flake-compat_4",
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-utils": "flake-utils_6",
|
||||||
"fourmolu-011": "fourmolu-011_2",
|
"fourmolu-011": "fourmolu-011_2",
|
||||||
"fourmolu-012": "fourmolu-012_2",
|
"fourmolu-012": "fourmolu-012_2",
|
||||||
"gitignore": "gitignore_2",
|
"gitignore": "gitignore_2",
|
||||||
@ -548,7 +613,7 @@
|
|||||||
"lsp": "lsp_2",
|
"lsp": "lsp_2",
|
||||||
"lsp-test": "lsp-test_2",
|
"lsp-test": "lsp-test_2",
|
||||||
"lsp-types": "lsp-types_2",
|
"lsp-types": "lsp-types_2",
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"ormolu-052": "ormolu-052_2",
|
"ormolu-052": "ormolu-052_2",
|
||||||
"ormolu-07": "ormolu-07_2",
|
"ormolu-07": "ormolu-07_2",
|
||||||
"stylish-haskell-0145": "stylish-haskell-0145_2"
|
"stylish-haskell-0145": "stylish-haskell-0145_2"
|
||||||
@ -713,6 +778,28 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"home-manager_3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"railbird-secrets",
|
||||||
|
"agenix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1703113217,
|
||||||
|
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"imalison-taffybar": {
|
"imalison-taffybar": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
@ -1051,6 +1138,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709703039,
|
||||||
|
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686874404,
|
"lastModified": 1686874404,
|
||||||
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
|
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
|
||||||
@ -1066,7 +1169,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682134069,
|
"lastModified": 1682134069,
|
||||||
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||||
@ -1187,6 +1290,26 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"railbird-secrets": {
|
||||||
|
"inputs": {
|
||||||
|
"agenix": "agenix_2",
|
||||||
|
"flake-utils": "flake-utils_5",
|
||||||
|
"nixpkgs": "nixpkgs_7"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1718069159,
|
||||||
|
"narHash": "sha256-L66mczMl8BPLwZrTVKrXMZRyxHiPvA3CHywbsQyFHW0=",
|
||||||
|
"ref": "refs/heads/master",
|
||||||
|
"rev": "609f1d32fd1112068d97df0f7d4de82cec878002",
|
||||||
|
"revCount": 52,
|
||||||
|
"type": "git",
|
||||||
|
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
@ -1203,8 +1326,9 @@
|
|||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-regression": "nixpkgs-regression_2",
|
"nixpkgs-regression": "nixpkgs-regression_2",
|
||||||
"notifications-tray-icon": "notifications-tray-icon",
|
"notifications-tray-icon": "notifications-tray-icon",
|
||||||
|
"railbird-secrets": "railbird-secrets",
|
||||||
"status-notifier-item": "status-notifier-item",
|
"status-notifier-item": "status-notifier-item",
|
||||||
"systems": "systems_4",
|
"systems": "systems_6",
|
||||||
"taffybar": "taffybar",
|
"taffybar": "taffybar",
|
||||||
"vscode-server": "vscode-server",
|
"vscode-server": "vscode-server",
|
||||||
"xmonad": "xmonad",
|
"xmonad": "xmonad",
|
||||||
@ -1380,6 +1504,36 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_7": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems_8": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"taffybar": {
|
"taffybar": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
@ -1452,8 +1606,8 @@
|
|||||||
},
|
},
|
||||||
"vscode-server": {
|
"vscode-server": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_6",
|
"flake-utils": "flake-utils_7",
|
||||||
"nixpkgs": "nixpkgs_8"
|
"nixpkgs": "nixpkgs_9"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713958148,
|
"lastModified": 1713958148,
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
|
railbird-secrets = {
|
||||||
|
url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git";
|
||||||
|
};
|
||||||
nixos-hardware = { url = "github:colonelpanic8/nixos-hardware"; };
|
nixos-hardware = { url = "github:colonelpanic8/nixos-hardware"; };
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
@ -152,7 +155,10 @@
|
|||||||
inherit inputs machineNames;
|
inherit inputs machineNames;
|
||||||
makeEnable = (import ./make-enable.nix) nixpkgs.lib;
|
makeEnable = (import ./make-enable.nix) nixpkgs.lib;
|
||||||
keys = (import ./keys.nix);
|
keys = (import ./keys.nix);
|
||||||
usersInfo = (import ./users.nix) { pkgs = { zsh = "zsh"; }; keys = keys; };
|
usersInfo = (import ./users.nix) {
|
||||||
|
pkgs = { zsh = "zsh"; };
|
||||||
|
inherit keys inputs system;
|
||||||
|
};
|
||||||
realUsers = (builtins.attrNames
|
realUsers = (builtins.attrNames
|
||||||
(nixpkgs.lib.filterAttrs
|
(nixpkgs.lib.filterAttrs
|
||||||
(_: value: (builtins.elem "isNormalUser" (builtins.attrNames value)) && value.isNormalUser) usersInfo.users.users)
|
(_: value: (builtins.elem "isNormalUser" (builtins.attrNames value)) && value.isNormalUser) usersInfo.users.users)
|
||||||
|
@ -26,6 +26,7 @@ rec {
|
|||||||
];
|
];
|
||||||
deanKeys = [
|
deanKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan"
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeXvPyHIYBPtn6QJtOrjlBUsZjDonVRfmWqTTM2ITWx nixos@nixos"
|
||||||
];
|
];
|
||||||
alexKeys = [
|
alexKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2SQkJenAX67Ze99SKOVpKDD1XvAZnxQ8RLP0dL/Ej2 alexm@MALISONSERVER"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2SQkJenAX67Ze99SKOVpKDD1XvAZnxQ8RLP0dL/Ej2 alexm@MALISONSERVER"
|
||||||
@ -51,4 +52,7 @@ rec {
|
|||||||
"AAAAB3NzaC1yc2EAAAADAQABAAACAQC4ayU9sly58EHQ2YdrnoJ5o0mFD8I8UiDvN3kVh6oSMMQ9wkVzLUY6wUzlc0uq3P/OYco9mURMt83C+lY4UC+jvN09nIEHV7yVJWsKV3ntmnEqM63e9cOWnpC9XA1MSha7xrf9DaO/doxST4fY6ixZA+nbE0bFgNTqyjzdya7pCamAdnPqKqwUEha+0KfpA8TJlrfgrDLd65f2/+jLU8fhTkU6yhrJ9Piq7C+RwVTu/dlrp50PNirfQRSa7vUPNS8Y973XtK6jzB/xS2Qc6iGJ+4QcCy6lgu2xksO/MNIimZYGOCP2yx6/GDp/gnOlAktrJ3flMycJdEHkZVH61HfQV76O/mY3tck/SiCwhuNxXw0uh9wf4UO8JHlnJcsIsBkSBemJsxQul+G7kV4EV/gqW/iO5U2nKmDqbwNWigO9mN44LqBOwsnAnu78kiSE8sNCEdSy/qVWloBw4VyT/emvmTwP1okh/CKNnu0/HmfSNL6Vib1XuvKSPvrUIOLMrSeRdtu85LrWaS0CvKEoMrIgpvc+3jHtdbxwINE3JBGrbXvfe20CuHl6Fx0ONkhirRmrjG7iUjV/4c6nS2aguPVsGi7q3GYvtz7cNEe3XbfpZaHzrCncnoQPbnSDLjHdeZf4O5Aew6iOwwkpgBBDA3lJO55ujq2vNbgkpH3hmQjltQ=="
|
"AAAAB3NzaC1yc2EAAAADAQABAAACAQC4ayU9sly58EHQ2YdrnoJ5o0mFD8I8UiDvN3kVh6oSMMQ9wkVzLUY6wUzlc0uq3P/OYco9mURMt83C+lY4UC+jvN09nIEHV7yVJWsKV3ntmnEqM63e9cOWnpC9XA1MSha7xrf9DaO/doxST4fY6ixZA+nbE0bFgNTqyjzdya7pCamAdnPqKqwUEha+0KfpA8TJlrfgrDLd65f2/+jLU8fhTkU6yhrJ9Piq7C+RwVTu/dlrp50PNirfQRSa7vUPNS8Y973XtK6jzB/xS2Qc6iGJ+4QcCy6lgu2xksO/MNIimZYGOCP2yx6/GDp/gnOlAktrJ3flMycJdEHkZVH61HfQV76O/mY3tck/SiCwhuNxXw0uh9wf4UO8JHlnJcsIsBkSBemJsxQul+G7kV4EV/gqW/iO5U2nKmDqbwNWigO9mN44LqBOwsnAnu78kiSE8sNCEdSy/qVWloBw4VyT/emvmTwP1okh/CKNnu0/HmfSNL6Vib1XuvKSPvrUIOLMrSeRdtu85LrWaS0CvKEoMrIgpvc+3jHtdbxwINE3JBGrbXvfe20CuHl6Fx0ONkhirRmrjG7iUjV/4c6nS2aguPVsGi7q3GYvtz7cNEe3XbfpZaHzrCncnoQPbnSDLjHdeZf4O5Aew6iOwwkpgBBDA3lJO55ujq2vNbgkpH3hmQjltQ=="
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEBce6E/XCdo8+dC4PPyyTsO/Z0BZxuz0IrTLaGehrT weitzman.micah@gmail.com"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEBce6E/XCdo8+dC4PPyyTsO/Z0BZxuz0IrTLaGehrT weitzman.micah@gmail.com"
|
||||||
];
|
];
|
||||||
|
benKeys = [
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com"
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
@ -21,4 +21,19 @@
|
|||||||
home-manager.users = forEachUser {
|
home-manager.users = forEachUser {
|
||||||
home.stateVersion = "22.05";
|
home.stateVersion = "22.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.users.ben = {
|
||||||
|
extraGroups = [
|
||||||
|
"audio"
|
||||||
|
"adbusers"
|
||||||
|
"disk"
|
||||||
|
"docker"
|
||||||
|
"networkmanager"
|
||||||
|
"openrazer"
|
||||||
|
"plugdev"
|
||||||
|
"syncthing"
|
||||||
|
"systemd-journal"
|
||||||
|
"video"
|
||||||
|
] ++ ["wheel"];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -98,7 +98,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.home-assistant = {
|
services.home-assistant = {
|
||||||
enable = true;
|
enable = false;
|
||||||
extraComponents = [
|
extraComponents = [
|
||||||
# Components required to complete the onboarding
|
# Components required to complete the onboarding
|
||||||
"met"
|
"met"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, forEachUser, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
modules.base.enable = true;
|
modules.base.enable = true;
|
||||||
modules.desktop.enable = true;
|
modules.desktop.enable = true;
|
||||||
modules.xmonad.enable = true;
|
modules.xmonad.enable = false;
|
||||||
modules.extra.enable = false;
|
modules.extra.enable = false;
|
||||||
modules.code.enable = true;
|
modules.code.enable = true;
|
||||||
modules.games.enable = false;
|
modules.games.enable = false;
|
||||||
@ -34,29 +34,15 @@
|
|||||||
services.xserver.libinput.enable = true;
|
services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6";
|
device = "/dev/disk/by-uuid/36864608-8e74-42b8-a075-27b59ef2701d";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8142784e-45c6-4a2b-91f1-09df741ac00f";
|
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/36E1-BE93";
|
device = "/dev/disk/by-uuid/36E1-BE93";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.resume-fix = {
|
|
||||||
description = "Fixes acpi immediate resume after suspend";
|
|
||||||
wantedBy = [ "multi-user.target" "post-resume.target" ];
|
|
||||||
after = [ "multi-user.target" "post-resume.target" ];
|
|
||||||
script = ''
|
|
||||||
if ${pkgs.gnugrep}/bin/grep -q '\bXHC\b.*\benabled\b' /proc/acpi/wakeup; then
|
|
||||||
echo XHC > /proc/acpi/wakeup
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
serviceConfig.Type = "oneshot";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{
|
{
|
||||||
device = "/swapfile";
|
device = "/swapfile";
|
||||||
@ -65,10 +51,12 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "ivanm-dfinity-razer";
|
networking.hostName = "david-blade";
|
||||||
|
|
||||||
nix.settings.maxJobs = lib.mkDefault 12;
|
home-manager.users = forEachUser {
|
||||||
|
home.stateVersion = "24.05";
|
||||||
|
};
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
system.stateVersion = "18.03";
|
system.stateVersion = "24.05";
|
||||||
}
|
}
|
@ -45,6 +45,10 @@
|
|||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-uuid/598e9aa1-4940-4410-a2fa-3dfd8b7d2c0d"; }
|
||||||
|
];
|
||||||
|
|
||||||
home-manager.users = forEachUser {
|
home-manager.users = forEachUser {
|
||||||
home.stateVersion = "23.11";
|
home.stateVersion = "23.11";
|
||||||
};
|
};
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
options = [ "nofail" ];
|
options = [ "nofail" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =[
|
swapDevices = [
|
||||||
{ device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
|
{ device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
34
nixos/machines/strixi-minaj-wsl.nix
Normal file
34
nixos/machines/strixi-minaj-wsl.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ lib, pkgs, config, inputs, forEachUser, ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../configuration.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
modules.wsl.enable = true;
|
||||||
|
|
||||||
|
networking.hostName = "strixi-minaj-wsl";
|
||||||
|
|
||||||
|
wsl.defaultUser = "imalison";
|
||||||
|
system.stateVersion = "23.11"; # Did you read the comment?
|
||||||
|
|
||||||
|
home-manager.users = forEachUser {
|
||||||
|
home.stateVersion = "23.11";
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.gnupg = {
|
||||||
|
agent = {
|
||||||
|
pinentryPackage = pkgs.pinentry-curses;
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"openssl-1.0.2u"
|
||||||
|
"electron-12.2.3"
|
||||||
|
"etcher"
|
||||||
|
"electron-19.1.9"
|
||||||
|
"openssl-1.1.1w"
|
||||||
|
"nix-2.16.2"
|
||||||
|
];
|
||||||
|
}
|
@ -29,9 +29,11 @@
|
|||||||
keep-derivations = true;
|
keep-derivations = true;
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
|
"https://cuda-maintainers.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
|
"cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
|
||||||
|
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||||
];
|
];
|
||||||
nix-path = nixPath;
|
nix-path = nixPath;
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
security.pam.sshAgentAuth.enable = true;
|
||||||
services.avahi = {
|
services.avahi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nssmdns4 = true;
|
nssmdns4 = true;
|
||||||
@ -19,13 +20,15 @@
|
|||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
AllowAgentForwarding = true;
|
||||||
|
AllowTcpForwarding = true;
|
||||||
PasswordAuthentication = false;
|
PasswordAuthentication = false;
|
||||||
X11Forwarding = true;
|
X11Forwarding = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
forwardX11 = true;
|
forwardX11 = false;
|
||||||
setXAuthLocation = true;
|
setXAuthLocation = true;
|
||||||
knownHosts = {
|
knownHosts = {
|
||||||
github = {
|
github = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, keys, ... }:
|
{ pkgs, keys, inputs, system, ... }:
|
||||||
let
|
let
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"audio"
|
"audio"
|
||||||
@ -84,6 +84,16 @@ in
|
|||||||
name = "unprivileged";
|
name = "unprivileged";
|
||||||
openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys;
|
openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys;
|
||||||
};
|
};
|
||||||
|
ben = userDefaults // {
|
||||||
|
inherit extraGroups;
|
||||||
|
name = "ben";
|
||||||
|
openssh.authorizedKeys.keys = benKeys ++ kanivanKeys;
|
||||||
|
};
|
||||||
|
railbird = userDefaults // {
|
||||||
|
inherit extraGroups;
|
||||||
|
name = "railbird";
|
||||||
|
openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdDevKeys;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.sshServe = {
|
nix.sshServe = {
|
||||||
|
@ -7,13 +7,15 @@ makeEnable config "modules.wsl" false {
|
|||||||
modules.base.enable = false;
|
modules.base.enable = false;
|
||||||
modules.desktop.enable = false;
|
modules.desktop.enable = false;
|
||||||
modules.xmonad.enable = false;
|
modules.xmonad.enable = false;
|
||||||
|
modules.plasma.enable = false;
|
||||||
|
|
||||||
# Update timezone automatically
|
# Update timezone automatically
|
||||||
services.tzupdate.enable = true;
|
services.tzupdate.enable = true;
|
||||||
|
|
||||||
|
wsl.wslConf.automount.root = "/mnt";
|
||||||
|
|
||||||
wsl = {
|
wsl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
automountPath = "/mnt";
|
|
||||||
startMenuLaunchers = true;
|
startMenuLaunchers = true;
|
||||||
nativeSystemd = true;
|
nativeSystemd = true;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user