feat: big cleanup
parent
3bf3943bf2
commit
d23c70e2a2
|
|
@ -22,8 +22,9 @@ let
|
|||
"$@"
|
||||
'';
|
||||
|
||||
in {
|
||||
imports = [ ./nixos/hardware-configuration/capibara.nix ./nixos/common.nix ];
|
||||
in
|
||||
{
|
||||
imports = [ ./hardware-configuration/capibara.nix ./common.nix ];
|
||||
|
||||
home-manager = {
|
||||
users.rilla.imports =
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@
|
|||
}];
|
||||
|
||||
knownHosts = {
|
||||
"*.monotremata.xyz,10.*,narwhal,suricata,pikvm,caladan,fugu,snitch,trantor,capibara,axolotl,echidna" =
|
||||
"*.monotremata.xyz,10.*,narwhal,suricata,pikvm,caladan,fugu,snitch,trantor,capibara,axolotl" =
|
||||
{
|
||||
certAuthority = true;
|
||||
publicKey =
|
||||
157
echidna.nix
157
echidna.nix
|
|
@ -1,157 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
choose-pass =
|
||||
pkgs.callPackage ./macos/choose-pass.nix { inherit config pkgs; };
|
||||
in {
|
||||
nix.extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
|
||||
# nixpkgs.config.permittedInsecurePackages = [ "python-2.7.18.6" ];
|
||||
|
||||
# List packages installed in system profile. To search by name, run:
|
||||
# $ nix-env -qaP | grep wget
|
||||
# environment.systemPackages = [ ];
|
||||
environment.systemPackages = [
|
||||
(pkgs.pass.withExtensions (exts: [ exts.pass-otp ]))
|
||||
choose-pass
|
||||
# pkgs.khal
|
||||
pkgs.alacritty
|
||||
pkgs.gopass
|
||||
pkgs.ansible
|
||||
pkgs.bat
|
||||
pkgs.black
|
||||
pkgs.cheat
|
||||
pkgs.cmatrix
|
||||
pkgs.colima
|
||||
pkgs.coreutils-full
|
||||
pkgs.csvkit
|
||||
pkgs.curl
|
||||
pkgs.diff-so-fancy
|
||||
pkgs.docker-client
|
||||
pkgs.docker-machine
|
||||
pkgs.exa
|
||||
pkgs.fzf
|
||||
pkgs.getopt
|
||||
pkgs.gnupg
|
||||
pkgs.go
|
||||
pkgs.google-cloud-sdk
|
||||
pkgs.gping
|
||||
pkgs.hlint
|
||||
pkgs.htop
|
||||
pkgs.imagemagick
|
||||
pkgs.jq
|
||||
pkgs.khard
|
||||
pkgs.libmysqlclient.dev
|
||||
pkgs.mosh
|
||||
pkgs.mpc-cli
|
||||
pkgs.ncmpcpp
|
||||
pkgs.neofetch
|
||||
pkgs.neomutt
|
||||
pkgs.newsboat
|
||||
pkgs.nixfmt
|
||||
pkgs.nodePackages.pyright
|
||||
pkgs.python310Packages.python-lsp-server
|
||||
# pkgs.python310Packages.pylsp-mypy
|
||||
pkgs.openssh
|
||||
pkgs.pinentry_mac
|
||||
pkgs.pipenv
|
||||
pkgs.python310Full
|
||||
pkgs.python310Packages.pip
|
||||
pkgs.python310Packages.virtualenvwrapper
|
||||
# pkgs.pythonFull
|
||||
pkgs.ripgrep
|
||||
pkgs.shellcheck
|
||||
pkgs.shfmt
|
||||
pkgs.sqlfluff
|
||||
pkgs.starship
|
||||
pkgs.stow
|
||||
pkgs.terraform
|
||||
pkgs.tmux
|
||||
pkgs.tree
|
||||
pkgs.urlscan
|
||||
pkgs.vagrant
|
||||
pkgs.vdirsyncer
|
||||
pkgs.virtualenv
|
||||
pkgs.wget
|
||||
pkgs.wireguard-go
|
||||
pkgs.wireguard-tools
|
||||
pkgs.yubikey-personalization
|
||||
pkgs.zsh
|
||||
];
|
||||
# Use a custom configuration.nix location.
|
||||
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
|
||||
environment.darwinConfig = "/Users/rilla/configs/nix-config/echidna.nix";
|
||||
# environment.variables.DOCKER_HOST = "tcp://localhost:2375";
|
||||
|
||||
# Auto upgrade nix package and the daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
# nix.package = pkgs.nix;
|
||||
|
||||
# Create /etc/bashrc that loads the nix-darwin environment.
|
||||
programs.zsh.enable = true; # default shell on catalina
|
||||
# programs.fish.enable = true;
|
||||
|
||||
# Used for backwards compatibility, please read the changelog before changing.
|
||||
# $ darwin-rebuild changelog
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
homebrew = {
|
||||
enable = true;
|
||||
onActivation = {
|
||||
cleanup = "zap";
|
||||
autoUpdate = true;
|
||||
upgrade = true;
|
||||
};
|
||||
global = {
|
||||
brewfile = true;
|
||||
lockfiles = true;
|
||||
};
|
||||
casks = [ "kmbmpdc" "librewolf" "virtualbox" "bluetility" ];
|
||||
brews = [
|
||||
"pyenv"
|
||||
"pyenv-virtualenv"
|
||||
"mpd"
|
||||
"choose-gui"
|
||||
"vitetris"
|
||||
"yabai"
|
||||
"skhd"
|
||||
"spacebar"
|
||||
"gnu-getopt"
|
||||
"coreutils"
|
||||
"pinentry-mac"
|
||||
];
|
||||
taps = [
|
||||
"homebrew/bundle"
|
||||
"homebrew/cask"
|
||||
"homebrew/core"
|
||||
"homebrew/services"
|
||||
"koekeishiya/formulae"
|
||||
"cmacrae/formulae"
|
||||
];
|
||||
};
|
||||
|
||||
fonts = {
|
||||
fontDir.enable = true;
|
||||
fonts = [
|
||||
(pkgs.nerdfonts.override { fonts = [ "Hack" "MPlus" ]; })
|
||||
pkgs.inter
|
||||
pkgs.hack-font
|
||||
pkgs.libertinus
|
||||
];
|
||||
};
|
||||
|
||||
users.users.rilla = {
|
||||
name = "rilla";
|
||||
home = "/Users/rilla";
|
||||
};
|
||||
|
||||
home-manager = { users.rilla.imports = [ home/echidna.nix ]; };
|
||||
|
||||
system.stateVersion = 4;
|
||||
}
|
||||
22
flake.lock
22
flake.lock
|
|
@ -1,26 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1690100173,
|
||||
"narHash": "sha256-v3DT7u5KlW1ZoulvFQPndbg0gVD0zKGkJmPqGsBVQ3I=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "0f9058e739dbefc676dee557b4b627962268d556",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lnl7",
|
||||
"ref": "master",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -105,7 +84,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
|
|
|
|||
19
flake.nix
19
flake.nix
|
|
@ -9,14 +9,16 @@
|
|||
};
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
darwin = {
|
||||
url = "github:lnl7/nix-darwin/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager
|
||||
, impermanence, darwin }@inputs: {
|
||||
outputs =
|
||||
{ self
|
||||
, nixpkgs
|
||||
, nixpkgs-stable
|
||||
, nixos-hardware
|
||||
, home-manager
|
||||
, impermanence
|
||||
}@inputs: {
|
||||
nixosConfigurations = {
|
||||
trantor = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
|
|
@ -49,10 +51,5 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
|
||||
darwinConfigurations.echidna = darwin.lib.darwinSystem {
|
||||
system = "x86_64-darwin";
|
||||
modules = [ ./echidna.nix home-manager.darwinModule ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
|
|
@ -9,7 +9,6 @@ in
|
|||
# enableDragDrop = true;
|
||||
enableCrypto = true;
|
||||
name = "capibara";
|
||||
server = "echidna";
|
||||
};
|
||||
|
||||
home.file.".local/share/barrier/SSL/Fingerprints/TrustedServers.txt".text = "${fingerprint}\n";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
# [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ];
|
||||
# [ ./nixos-common.nix ./desktop-xmonad/capibara.nix ./alacritty/capibara.nix ./theming ];
|
||||
[ ./nixos-common.nix ./desktop-river ./alacritty/capibara.nix ./theming ];
|
||||
imports = [ ./common.nix ./desktop-river ./theming ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
imports = [
|
||||
./arduino
|
||||
./barrier
|
||||
# ./barrier
|
||||
./browsers
|
||||
./cheat
|
||||
./dav
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
imports = [ ./neovim ];
|
||||
home.stateVersion = "22.11";
|
||||
}
|
||||
|
|
@ -27,7 +27,6 @@ in {
|
|||
"lb" = defaultBlock;
|
||||
"kitchen" = defaultBlock;
|
||||
"capibara" = defaultBlock;
|
||||
"echidna" = defaultBlock;
|
||||
"pikvm" = defaultBlock;
|
||||
"narwhal" = defaultBlock;
|
||||
"trantor" = defaultBlock;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./nixos-common.nix ./desktop-river ./theming/trantor.nix ];
|
||||
imports = [ ./common.nix ./desktop-river ./theming/trantor.nix ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
pkgs.writeScriptBin "choose-pass" ''
|
||||
#!${pkgs.dash}/bin/dash
|
||||
|
||||
prefix=''${PASSWORD_STORE_DIR-"''${HOME}/.password-store"}
|
||||
|
||||
sel=$(
|
||||
${pkgs.findutils}/bin/find "$prefix" -name '*.gpg' | \
|
||||
${pkgs.gnused}/bin/sed -E "s|^''${prefix}/?||" | \
|
||||
${pkgs.gnused}/bin/sed 's/.gpg$//' | \
|
||||
/usr/local/bin/choose -f Inter -s 20 -c fbf1c7 -b 458588
|
||||
)
|
||||
|
||||
[ -n "$sel" ] || exit
|
||||
|
||||
${pkgs.pass}/bin/pass show "$sel" | tr -d "\n" | /usr/bin/pbcopy
|
||||
''
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let choose-pass = pkgs.callPackage ./choose-pass.nix { inherit config pkgs; };
|
||||
in {
|
||||
# services.yabai = {
|
||||
# enable = true;
|
||||
# package = pkgs.yabai;
|
||||
# # enableScriptingAddition = true;
|
||||
# enableScriptingAddition = false;
|
||||
# config = {
|
||||
# external_bar = "all:28:0";
|
||||
# layout = "bsp";
|
||||
# auto_balance = "off";
|
||||
# mouse_modifier = "fn";
|
||||
# mouse_action1 = "move";
|
||||
# mouse_action2 = "resize";
|
||||
# mouse_follows_focus = "on";
|
||||
# focus_follows_mouse = "autoraise";
|
||||
# window_topmost = "on"; # floating windows always on top
|
||||
# window_shadow = "float";
|
||||
# window_opacity = "on";
|
||||
# active_window_opacity = "1.0";
|
||||
# normal_window_opacity = "1.0";
|
||||
# window_border = "on";
|
||||
# window_border_width = 8;
|
||||
# active_window_border_color = "0xff458588";
|
||||
# normal_window_border_color = "0xff504945";
|
||||
# };
|
||||
# extraConfig = ''
|
||||
# yabai -m rule --add app="^choose" manage=off
|
||||
# '';
|
||||
# };
|
||||
|
||||
services.skhd = {
|
||||
enable = true;
|
||||
package = pkgs.skhd;
|
||||
skhdConfig = ''
|
||||
# ctrl + alt - return : osascript /Users/rilla/configs/scripts/osascripts/iterm.scpt
|
||||
ctrl + alt - return : ${pkgs.alacritty}/bin/alacritty
|
||||
|
||||
ctrl + alt - 1 : yabai -m space --focus 1
|
||||
ctrl + alt - 2 : yabai -m space --focus 2
|
||||
ctrl + alt - 3 : yabai -m space --focus 3
|
||||
ctrl + alt - 4 : yabai -m space --focus 4
|
||||
ctrl + alt - 5 : yabai -m space --focus 5
|
||||
ctrl + alt - 6 : yabai -m space --focus 6
|
||||
ctrl + alt - 7 : yabai -m space --focus 7
|
||||
ctrl + alt - 8 : yabai -m space --focus 8
|
||||
ctrl + alt - 9 : yabai -m space --focus 9
|
||||
ctrl + alt - 0 : yabai -m space --focus 10
|
||||
|
||||
ctrl + alt - n : yabai -m window --focus next || yabai -m window --focus first
|
||||
ctrl + alt - p : yabai -m window --focus prev || yabai -m window --focus last
|
||||
|
||||
ctrl + alt + shift - r : yabai -m space --rotate 90
|
||||
|
||||
ctrl + alt + shift - 1 : yabai -m window --space 1
|
||||
ctrl + alt + shift - 2 : yabai -m window --space 2
|
||||
ctrl + alt + shift - 3 : yabai -m window --space 3
|
||||
ctrl + alt + shift - 4 : yabai -m window --space 4
|
||||
ctrl + alt + shift - 5 : yabai -m window --space 5
|
||||
ctrl + alt + shift - 6 : yabai -m window --space 6
|
||||
ctrl + alt + shift - 7 : yabai -m window --space 7
|
||||
ctrl + alt + shift - 8 : yabai -m window --space 8
|
||||
ctrl + alt + shift - 9 : yabai -m window --space 9
|
||||
ctrl + alt + shift - 0 : yabai -m window --space 10
|
||||
|
||||
# ctrl + alt + shift - space : yabai -m space --balance
|
||||
ctrl + alt - space : yabai -m space --layout $(yabai -m query --spaces --space | jq -r 'if .["type"] == "bsp" then "float" else "bsp" end')
|
||||
ctrl + alt - b : yabai -m space --balance
|
||||
ctrl + alt + shift - space : yabai -m space --layout bsp
|
||||
|
||||
# ctrl + alt + shift - c : yabai -m window --close
|
||||
|
||||
ctrl + alt - right : yabai -m space --focus next || yabai -m space --focus first
|
||||
ctrl + alt - left : yabai -m space --focus prev || yabai -m space --focus last
|
||||
|
||||
ctrl + alt - h : yabai -m window --focus west
|
||||
ctrl + alt - l : yabai -m window --focus east
|
||||
ctrl + alt - j : yabai -m window --focus south
|
||||
ctrl + alt - k : yabai -m window --focus north
|
||||
|
||||
ctrl + alt + shift - h : yabai -m window --swap west
|
||||
ctrl + alt + shift - l : yabai -m window --swap east
|
||||
ctrl + alt + shift - j : yabai -m window --swap south
|
||||
ctrl + alt + shift - k : yabai -m window --swap north
|
||||
|
||||
ctrl + alt - w : yabai -m display --focus 1
|
||||
ctrl + alt - e : yabai -m display --focus 2
|
||||
|
||||
ctrl + alt - g : yabai -m space --toggle gap && yabai -m space --toggle padding
|
||||
|
||||
ctrl + alt - x : yabai -m space --mirror y-axis
|
||||
ctrl + alt - y : yabai -m space --mirror x-axis
|
||||
|
||||
ctrl + alt - m : yabai -m window --toggle zoom-fullscreen
|
||||
ctrl + alt - t : yabai -m window --toggle float
|
||||
|
||||
:: choose
|
||||
ctrl + alt - a ; choose
|
||||
choose < p : skhd -k 'escape'; ${choose-pass}/bin/choose-pass
|
||||
choose < escape ; default
|
||||
|
||||
play : ${pkgs.mpc_cli}/bin/mpc toggle
|
||||
'';
|
||||
};
|
||||
|
||||
# services.spacebar = {
|
||||
# enable = true;
|
||||
# package = pkgs.spacebar;
|
||||
# config = {
|
||||
# position = "top";
|
||||
# height = 28;
|
||||
# spacing_left = 25;
|
||||
# spacing_right = 25;
|
||||
# text_font = ''"Inter:Regular:12.0"'';
|
||||
# icon_font = ''"Font Awesome 5 Free:Solid:12.0"'';
|
||||
# background_color = "0xff282828";
|
||||
# foreground_color = "0xffebdbb2";
|
||||
|
||||
# space_icon_color = "0xff83a598";
|
||||
# space_icon = "•";
|
||||
# space_icon_strip = "1 2 3 4 5 6 7 8 9 10";
|
||||
|
||||
# power_icon_strip = " ";
|
||||
|
||||
# clock_icon = "";
|
||||
# clock_format = ''"%d/%m/%y %R"'';
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
let home = "/home/rilla";
|
||||
in {
|
||||
imports = [ ./nixos/hardware-configuration/trantor.nix ./nixos/common.nix ];
|
||||
imports = [ ./hardware-configuration/trantor.nix ./common.nix ];
|
||||
|
||||
home-manager = {
|
||||
users.rilla.imports =
|
||||
|
|
|
|||
Loading…
Reference in New Issue