Compare commits
No commits in common. "d96e3eb02ebec339e9f785f49686dd949a9e7034" and "0f7e3596de0523948b0aa8db0fb0986523435319" have entirely different histories.
d96e3eb02e
...
0f7e3596de
8
.travis.yml
Normal file
8
.travis.yml
Normal file
@ -0,0 +1,8 @@
|
||||
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"
|
||||
63
dotfiles/config/htop/htoprc
Normal file
63
dotfiles/config/htop/htoprc
Normal file
@ -0,0 +1,63 @@
|
||||
# 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,29 +3331,6 @@ emr (emacs refactor) provides support for refactoring in many programming langua
|
||||
(setq lsp-ui-doc-position 'bottom)))))
|
||||
#+END_SRC
|
||||
* 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
|
||||
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
|
||||
@ -3435,12 +3412,6 @@ in term-mode. This makes term-mode 1000% more useful
|
||||
term-projectile-switch)
|
||||
:config
|
||||
(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
|
||||
term-projectile-forward
|
||||
term-projectile-create-new)
|
||||
@ -4129,12 +4100,7 @@ This also adds syntax highlighting for gradle
|
||||
#+END_SRC
|
||||
** evil
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package evil
|
||||
:commands (evil-mode)
|
||||
:config
|
||||
(use-package evil-collection
|
||||
:config
|
||||
(with-eval-after-load 'eat (evil-collection-eat-setup))))
|
||||
(use-package evil :commands (evil-mode))
|
||||
#+END_SRC
|
||||
** hackernews
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
|
||||
@ -163,8 +163,3 @@ This makes evil-mode play nice with org-fc
|
||||
(use-package org-drill)
|
||||
|
||||
#+end_src
|
||||
|
||||
* Disable wild notifactions
|
||||
#+begin_src emacs-lisp
|
||||
(setq org-wild-notifier-day-wide-alert-times nil)
|
||||
#+end_src
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
# -*- mode: snippet -*-
|
||||
# name: ign
|
||||
# key: ign
|
||||
# --
|
||||
# type: ignore
|
||||
@ -1,5 +0,0 @@
|
||||
# -*- mode: snippet -*-
|
||||
# name: logg
|
||||
# key: logg
|
||||
# --
|
||||
logger = logging.getLogger(__name__)
|
||||
@ -1,5 +0,0 @@
|
||||
# -*- mode: snippet -*-
|
||||
# name: 401
|
||||
# key: 401
|
||||
# --
|
||||
# noqa: F401
|
||||
@ -1,18 +0,0 @@
|
||||
{ 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;
|
||||
makeEnable = (import ../make-enable.nix) nixpkgs.lib;
|
||||
mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
|
||||
realUsers = [ "root" "imalison" "kat" "dean" "alex" "ben"];
|
||||
realUsers = [ "root" "imalison" "kat" "dean" "alex" ];
|
||||
forEachUser = mapValueToKeys realUsers;
|
||||
} // specialArgs // (import ../keys.nix);
|
||||
});
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
imports = [
|
||||
./android.nix
|
||||
./base.nix
|
||||
./ben.nix
|
||||
./cache-server.nix
|
||||
./cache.nix
|
||||
./code.nix
|
||||
|
||||
@ -86,6 +86,7 @@ makeEnable config "modules.desktop" true {
|
||||
vlc
|
||||
volnoti
|
||||
xfce.thunar
|
||||
zulip
|
||||
|
||||
# Audio
|
||||
picard
|
||||
@ -104,6 +105,5 @@ makeEnable config "modules.desktop" true {
|
||||
spotify
|
||||
tor-browser-bundle-bin
|
||||
vscode
|
||||
zulip
|
||||
] else []);
|
||||
}
|
||||
|
||||
@ -29,21 +29,6 @@ with lib;
|
||||
done
|
||||
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 = {
|
||||
|
||||
170
nixos/flake.lock
170
nixos/flake.lock
@ -21,30 +21,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -67,29 +43,6 @@
|
||||
"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": false,
|
||||
"locked": {
|
||||
@ -292,24 +245,6 @@
|
||||
"inputs": {
|
||||
"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": {
|
||||
"lastModified": 1685518550,
|
||||
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||
@ -324,9 +259,9 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_7": {
|
||||
"flake-utils_6": {
|
||||
"inputs": {
|
||||
"systems": "systems_8"
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
@ -601,7 +536,7 @@
|
||||
"haskell-language-server_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"fourmolu-011": "fourmolu-011_2",
|
||||
"fourmolu-012": "fourmolu-012_2",
|
||||
"gitignore": "gitignore_2",
|
||||
@ -613,7 +548,7 @@
|
||||
"lsp": "lsp_2",
|
||||
"lsp-test": "lsp-test_2",
|
||||
"lsp-types": "lsp-types_2",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"ormolu-052": "ormolu-052_2",
|
||||
"ormolu-07": "ormolu-07_2",
|
||||
"stylish-haskell-0145": "stylish-haskell-0145_2"
|
||||
@ -778,28 +713,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
@ -1138,22 +1051,6 @@
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"lastModified": 1686874404,
|
||||
"narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
|
||||
@ -1169,7 +1066,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1682134069,
|
||||
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||
@ -1290,26 +1187,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
@ -1326,9 +1203,8 @@
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-regression": "nixpkgs-regression_2",
|
||||
"notifications-tray-icon": "notifications-tray-icon",
|
||||
"railbird-secrets": "railbird-secrets",
|
||||
"status-notifier-item": "status-notifier-item",
|
||||
"systems": "systems_6",
|
||||
"systems": "systems_4",
|
||||
"taffybar": "taffybar",
|
||||
"vscode-server": "vscode-server",
|
||||
"xmonad": "xmonad",
|
||||
@ -1504,36 +1380,6 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
@ -1606,8 +1452,8 @@
|
||||
},
|
||||
"vscode-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713958148,
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
{
|
||||
inputs = {
|
||||
railbird-secrets = {
|
||||
url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git";
|
||||
};
|
||||
nixos-hardware = { url = "github:colonelpanic8/nixos-hardware"; };
|
||||
|
||||
nixpkgs = {
|
||||
@ -155,10 +152,7 @@
|
||||
inherit inputs machineNames;
|
||||
makeEnable = (import ./make-enable.nix) nixpkgs.lib;
|
||||
keys = (import ./keys.nix);
|
||||
usersInfo = (import ./users.nix) {
|
||||
pkgs = { zsh = "zsh"; };
|
||||
inherit keys inputs system;
|
||||
};
|
||||
usersInfo = (import ./users.nix) { pkgs = { zsh = "zsh"; }; keys = keys; };
|
||||
realUsers = (builtins.attrNames
|
||||
(nixpkgs.lib.filterAttrs
|
||||
(_: value: (builtins.elem "isNormalUser" (builtins.attrNames value)) && value.isNormalUser) usersInfo.users.users)
|
||||
|
||||
@ -26,7 +26,6 @@ rec {
|
||||
];
|
||||
deanKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeXvPyHIYBPtn6QJtOrjlBUsZjDonVRfmWqTTM2ITWx nixos@nixos"
|
||||
];
|
||||
alexKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2SQkJenAX67Ze99SKOVpKDD1XvAZnxQ8RLP0dL/Ej2 alexm@MALISONSERVER"
|
||||
@ -52,7 +51,4 @@ 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=="
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEBce6E/XCdo8+dC4PPyyTsO/Z0BZxuz0IrTLaGehrT weitzman.micah@gmail.com"
|
||||
];
|
||||
benKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com"
|
||||
];
|
||||
}
|
||||
|
||||
@ -21,19 +21,4 @@
|
||||
home-manager.users = forEachUser {
|
||||
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 = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
extraComponents = [
|
||||
# Components required to complete the onboarding
|
||||
"met"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, forEachUser, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
modules.base.enable = true;
|
||||
modules.desktop.enable = true;
|
||||
modules.xmonad.enable = false;
|
||||
modules.xmonad.enable = true;
|
||||
modules.extra.enable = false;
|
||||
modules.code.enable = true;
|
||||
modules.games.enable = false;
|
||||
@ -34,15 +34,29 @@
|
||||
services.xserver.libinput.enable = true;
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/36864608-8e74-42b8-a075-27b59ef2701d";
|
||||
device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8142784e-45c6-4a2b-91f1-09df741ac00f";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/36E1-BE93";
|
||||
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 = [
|
||||
{
|
||||
device = "/swapfile";
|
||||
@ -51,12 +65,10 @@
|
||||
}
|
||||
];
|
||||
|
||||
networking.hostName = "david-blade";
|
||||
networking.hostName = "ivanm-dfinity-razer";
|
||||
|
||||
home-manager.users = forEachUser {
|
||||
home.stateVersion = "24.05";
|
||||
};
|
||||
nix.settings.maxJobs = lib.mkDefault 12;
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
system.stateVersion = "24.05";
|
||||
system.stateVersion = "18.03";
|
||||
}
|
||||
@ -45,10 +45,6 @@
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/598e9aa1-4940-4410-a2fa-3dfd8b7d2c0d"; }
|
||||
];
|
||||
|
||||
home-manager.users = forEachUser {
|
||||
home.stateVersion = "23.11";
|
||||
};
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
{ 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,11 +29,9 @@
|
||||
keep-derivations = true;
|
||||
substituters = [
|
||||
"https://cache.nixos.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
];
|
||||
nix-path = nixPath;
|
||||
};
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
security.pam.sshAgentAuth.enable = true;
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
@ -20,15 +19,13 @@
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
AllowAgentForwarding = true;
|
||||
AllowTcpForwarding = true;
|
||||
PasswordAuthentication = false;
|
||||
X11Forwarding = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
forwardX11 = false;
|
||||
forwardX11 = true;
|
||||
setXAuthLocation = true;
|
||||
knownHosts = {
|
||||
github = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, keys, inputs, system, ... }:
|
||||
{ pkgs, keys, ... }:
|
||||
let
|
||||
extraGroups = [
|
||||
"audio"
|
||||
@ -84,16 +84,6 @@ in
|
||||
name = "unprivileged";
|
||||
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 = {
|
||||
|
||||
@ -7,15 +7,13 @@ makeEnable config "modules.wsl" false {
|
||||
modules.base.enable = false;
|
||||
modules.desktop.enable = false;
|
||||
modules.xmonad.enable = false;
|
||||
modules.plasma.enable = false;
|
||||
|
||||
# Update timezone automatically
|
||||
services.tzupdate.enable = true;
|
||||
|
||||
wsl.wslConf.automount.root = "/mnt";
|
||||
|
||||
wsl = {
|
||||
enable = true;
|
||||
automountPath = "/mnt";
|
||||
startMenuLaunchers = true;
|
||||
nativeSystemd = true;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user