Compare commits
1 Commits
hm-standal
...
4feb5b89e8
| Author | SHA1 | Date | |
|---|---|---|---|
| 4feb5b89e8 |
@@ -13,9 +13,9 @@ set $term alacritty
|
||||
set $menu wofi --term '$term'
|
||||
|
||||
### Output configuration
|
||||
output DP-3 pos 1920 0 res 1920x1080@60Hz
|
||||
output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
|
||||
output DP-2 pos 3840 0 res 1920x1080@60Hz
|
||||
output DP-3 pos 3840 0 res 1920x1080@59Hz
|
||||
output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
|
||||
output DP-2 pos 1920 0 res 1920x1080@60Hz
|
||||
|
||||
### Wallpaper
|
||||
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
||||
@@ -25,22 +25,22 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
|
||||
### Workspace binding
|
||||
|
||||
## DP-3 bindings
|
||||
workspace 1 output DP-3
|
||||
workspace 2 output DP-3
|
||||
workspace 4 output DP-3
|
||||
workspace 5 output DP-3
|
||||
workspace 1 output DP-2
|
||||
workspace 2 output DP-2
|
||||
workspace 4 output DP-2
|
||||
workspace 5 output DP-2
|
||||
|
||||
## HDMI-A-1 bindings
|
||||
workspace 3 output HDMI-A-1
|
||||
workspace 9 output HDMI-A-1
|
||||
|
||||
## DP-2 bindings
|
||||
workspace 6 output DP-2
|
||||
workspace 7 output DP-2
|
||||
workspace 8 output DP-2
|
||||
workspace 6 output DP-3
|
||||
workspace 7 output DP-3
|
||||
workspace 8 output DP-3
|
||||
|
||||
### Colour options
|
||||
set $bg #24283b
|
||||
set $bg #24283b
|
||||
set $bg-inactive #323232
|
||||
set $bg-urgent #000000
|
||||
set $text #eeeeec
|
||||
|
||||
107
flake.lock
generated
107
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759509947,
|
||||
"narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
|
||||
"lastModified": 1749744770,
|
||||
"narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
|
||||
"rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -64,11 +64,11 @@
|
||||
"zon2nix": "zon2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761172581,
|
||||
"narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
|
||||
"lastModified": 1754941490,
|
||||
"narHash": "sha256-2AJf0q4u1zakqjr0y4dCyqzdDSil8P5m2YpZxAAzJJw=",
|
||||
"owner": "ghostty-org",
|
||||
"repo": "ghostty",
|
||||
"rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
|
||||
"rev": "5bf632e9cc0e77a578bad983b0cbdf0451ce87d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -84,11 +84,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758463745,
|
||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||
"lastModified": 1753592768,
|
||||
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -116,37 +116,24 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 315532800,
|
||||
"narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
|
||||
"rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
|
||||
"lastModified": 1748189127,
|
||||
"narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
|
||||
"rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
|
||||
"url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
||||
"url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1758360447,
|
||||
"narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
|
||||
"rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1761016216,
|
||||
"narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
|
||||
"lastModified": 1754767907,
|
||||
"narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
|
||||
"rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -156,48 +143,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
"ghostty": "ghostty",
|
||||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"rust-overlay": "rust-overlay"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761100675,
|
||||
"narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
@@ -231,11 +183,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760401936,
|
||||
"narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
|
||||
"lastModified": 1748261582,
|
||||
"narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "365085b6652259753b598d43b723858184980bbe",
|
||||
"rev": "aafb1b093fb838f7a02613b719e85ec912914221",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -246,20 +198,27 @@
|
||||
},
|
||||
"zon2nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"flake-utils": [
|
||||
"ghostty",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"ghostty",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758405547,
|
||||
"narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
|
||||
"lastModified": 1742104771,
|
||||
"narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
|
||||
"owner": "jcollie",
|
||||
"repo": "zon2nix",
|
||||
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
||||
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jcollie",
|
||||
"repo": "zon2nix",
|
||||
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
||||
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
|
||||
45
flake.nix
45
flake.nix
@@ -12,7 +12,6 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
ghostty.url = "github:ghostty-org/ghostty";
|
||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
@@ -22,7 +21,6 @@
|
||||
darwin,
|
||||
home-manager,
|
||||
ghostty,
|
||||
rust-overlay,
|
||||
...
|
||||
}: let
|
||||
userName = "wyatt";
|
||||
@@ -30,29 +28,18 @@
|
||||
extraSpecialArgs = {
|
||||
inherit userName userEmail ghostty;
|
||||
};
|
||||
|
||||
myOverlays = { ... }: {
|
||||
nixpkgs.overlays = [
|
||||
rust-overlay.overlays.default
|
||||
] ++ (nixpkgs.lib.attrValues self.common.overlays);
|
||||
};
|
||||
in {
|
||||
meta = import ./meta;
|
||||
|
||||
common = {
|
||||
overlays = import ./modules/common/overlays.nix;
|
||||
};
|
||||
|
||||
# Primary laptop - MacBook Pro (2023, M3)
|
||||
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
|
||||
system = "aarch64-darwin";
|
||||
specialArgs = {
|
||||
inherit userName userEmail ghostty;
|
||||
hostname = "sephiroth";
|
||||
role = "workstation";
|
||||
role = "devel";
|
||||
};
|
||||
modules = [
|
||||
myOverlays
|
||||
./modules/common
|
||||
./modules/machine/sephiroth
|
||||
|
||||
@@ -60,9 +47,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; };
|
||||
# home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.backupFileExtension = "bak";
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName} = import ./home;
|
||||
}
|
||||
];
|
||||
@@ -74,10 +59,9 @@
|
||||
specialArgs = {
|
||||
inherit userName userEmail ghostty;
|
||||
hostname = "cloud";
|
||||
role = "workstation";
|
||||
role = "devel";
|
||||
};
|
||||
modules = [
|
||||
myOverlays
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
./modules/common
|
||||
./modules/machine/cloud
|
||||
@@ -87,7 +71,6 @@
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.backupFileExtension = "bak";
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
@@ -104,7 +87,6 @@
|
||||
role = "server";
|
||||
};
|
||||
modules = [
|
||||
myOverlays
|
||||
./modules/common
|
||||
./modules/machine/valefor
|
||||
|
||||
@@ -113,7 +95,6 @@
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.backupFileExtension = "bak";
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
@@ -130,7 +111,6 @@
|
||||
role = "server";
|
||||
};
|
||||
# modules = [
|
||||
# myOverlays
|
||||
# nix-flatpak.nixosModules.nix-flatpak
|
||||
# nix-ld.nixosModules.nix-ld
|
||||
# ./modules/nixos/hardware-configuration.nix
|
||||
@@ -143,30 +123,11 @@
|
||||
# home-manager.useGlobalPkgs = true;
|
||||
# home-manager.useUserPackages = true;
|
||||
# home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
# home-manager.backupFileExtension = "bak";
|
||||
# home-manager.users.${userName}.imports = [
|
||||
# ./home
|
||||
# ];
|
||||
# }
|
||||
# ];
|
||||
};
|
||||
|
||||
# generic non-NixOS Linux machine
|
||||
homeConfigurations."generic" = let
|
||||
hostname = builtins.getEnv "HOSTNAME";
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
in home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
# system = "x86_64-linux";
|
||||
extraSpecialArgs = extraSpecialArgs // {
|
||||
isNixOS = false;
|
||||
hostname = hostname;
|
||||
role = "workstation";
|
||||
};
|
||||
modules = [
|
||||
myOverlays
|
||||
./home
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ pkgs, ...}: {
|
||||
{...}: {
|
||||
programs.atuin = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
package = pkgs.atuinLatest;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
isNixOS,
|
||||
role,
|
||||
...
|
||||
}: {
|
||||
programs.firefox = {
|
||||
@@ -11,7 +9,7 @@
|
||||
};
|
||||
|
||||
programs.chromium = {
|
||||
enable = pkgs.stdenv.isLinux && isNixOS;
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
package = pkgs.ungoogled-chromium.override {
|
||||
enableWideVine = true;
|
||||
commandLineArgs = [
|
||||
|
||||
@@ -1,57 +1,63 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, userName
|
||||
, userEmail
|
||||
, ghostty
|
||||
, isNixOS ? true
|
||||
, role
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
# Have a file structure that holds all the configuration files that can't be configured by Nix
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
userName,
|
||||
userEmail,
|
||||
ghostty,
|
||||
...
|
||||
}: let
|
||||
# Have a file sturcture that holds all the configuration files that can't be configured by Nix
|
||||
# or maybe I'm too lazy to do anything about it? I dunno
|
||||
dirs = {
|
||||
defaults = ../defaults;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
# Import sub modules
|
||||
imports = [
|
||||
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
|
||||
./atuin.nix
|
||||
./shell.nix
|
||||
./packages
|
||||
./git.nix
|
||||
./starship.nix
|
||||
./eza.nix
|
||||
./neovim.nix
|
||||
./direnv.nix
|
||||
./sway.nix
|
||||
./terminal.nix
|
||||
./browser.nix
|
||||
./zellij.nix
|
||||
./bat.nix
|
||||
];
|
||||
|
||||
home = lib.mkMerge [
|
||||
{
|
||||
username = userName;
|
||||
homeDirectory =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then "/Users/${userName}"
|
||||
else "/home/${userName}";
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
home = {
|
||||
username = userName;
|
||||
homeDirectory =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then "/Users/${userName}"
|
||||
else "/home/${userName}";
|
||||
|
||||
stateVersion = "24.11";
|
||||
}
|
||||
sessionVariables = {
|
||||
XDG_CURRENT_DESKTOP = "sway";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_SESSION_DESKTOP="sway";
|
||||
XDG_CONFIG_HOME = "$HOME/.config";
|
||||
XDG_CACHE_HOME = "$HOME/.cache";
|
||||
XDG_DATA_HOME = "$HOME/.local/share";
|
||||
XDG_STATE_HOME = "$HOME/.local/state";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
};
|
||||
|
||||
(lib.mkIf isNixOS {
|
||||
sessionVariables = {
|
||||
XDG_CURRENT_DESKTOP = "sway";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_SESSION_DESKTOP = "sway";
|
||||
XDG_CONFIG_HOME = "$HOME/.config";
|
||||
XDG_CACHE_HOME = "$HOME/.cache";
|
||||
XDG_DATA_HOME = "$HOME/.local/share";
|
||||
XDG_STATE_HOME = "$HOME/.local/state";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
};
|
||||
})
|
||||
pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
|
||||
gtk.enable = true;
|
||||
package = pkgs.catppuccin-cursors.mochaDark;
|
||||
name = "catppuccin-mocha-dark-cursors";
|
||||
size = 22;
|
||||
};
|
||||
|
||||
(lib.mkIf pkgs.stdenv.isLinux {
|
||||
pointerCursor = {
|
||||
gtk.enable = true;
|
||||
package = pkgs.catppuccin-cursors.mochaDark;
|
||||
name = "catppuccin-mocha-dark-cursors";
|
||||
size = 22;
|
||||
};
|
||||
})
|
||||
];
|
||||
stateVersion = "24.11";
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
32
home/k9s.nix
32
home/k9s.nix
@@ -1,32 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
programs.k9s = {
|
||||
enable = true;
|
||||
package = pkgs.k9sLatest;
|
||||
settings.k9s = {
|
||||
refreshRate = "2s";
|
||||
liveViewAutoRefresh = false;
|
||||
apiServerTimeout = "30s";
|
||||
maxConnRetry = 5;
|
||||
readOnly = true;
|
||||
noExitOnCtrlC = false;
|
||||
portForwardAddress = "localhost";
|
||||
skipLatestRevCheck = false;
|
||||
|
||||
skin = {
|
||||
catppuccin-mocha = ./defaults/k9s/catppuccin-mocha.yml;
|
||||
};
|
||||
|
||||
ui = {
|
||||
skin = "catppuccin-mocha";
|
||||
enableMouse = true;
|
||||
headless = false;
|
||||
logoless = true;
|
||||
crumbsless = false;
|
||||
splashless = true;
|
||||
reactive = false;
|
||||
noIcons = false;
|
||||
defaultsToFullscreen = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
with pkgs;
|
||||
let
|
||||
plugins = writeText "plugins" ''
|
||||
krew
|
||||
oidc-login
|
||||
'';
|
||||
in {
|
||||
home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
$DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins}
|
||||
'';
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{ pkgs, ... }: {
|
||||
{...}: {
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
package = pkgs.lazygitLatest;
|
||||
|
||||
settings = {
|
||||
gui.theme = {
|
||||
|
||||
@@ -3,17 +3,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../atuin.nix
|
||||
../shell.nix
|
||||
../git.nix
|
||||
../starship.nix
|
||||
../eza.nix
|
||||
../neovim.nix
|
||||
../bat.nix
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
yazi # terminal file manager
|
||||
|
||||
# archives
|
||||
zip
|
||||
xz
|
||||
@@ -21,22 +13,40 @@
|
||||
p7zip
|
||||
|
||||
# utils
|
||||
yazi
|
||||
tmux
|
||||
lazygit
|
||||
bottom
|
||||
ripgrep
|
||||
jq
|
||||
yq-go
|
||||
fzf
|
||||
fh
|
||||
aria2
|
||||
gnupg
|
||||
yt-dlp
|
||||
obsidian
|
||||
vscode
|
||||
weechat
|
||||
inetutils
|
||||
|
||||
# misc
|
||||
cowsay
|
||||
file
|
||||
which
|
||||
tree
|
||||
gnutar
|
||||
gnupg
|
||||
zoxide
|
||||
babelfish
|
||||
|
||||
# language-specific package managers
|
||||
nodejs
|
||||
cargo
|
||||
python3
|
||||
|
||||
# nix specific stuff
|
||||
nixd
|
||||
deadnix
|
||||
alejandra
|
||||
statix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
|
||||
discord
|
||||
ollama
|
||||
];
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
{ pkgs, lib, role, ... }:
|
||||
{
|
||||
imports =
|
||||
[ ./common.nix ]
|
||||
++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix
|
||||
++ lib.optional pkgs.stdenv.isLinux ./linux.nix
|
||||
++ lib.optional (role == "workstation") ./workstation.nix
|
||||
++ lib.optional (role == "server") ./server.nix;
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./common.nix
|
||||
./darwin.nix
|
||||
./linux.nix
|
||||
];
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
|
||||
imv
|
||||
betterdiscordctl
|
||||
vesktop
|
||||
@@ -15,5 +16,5 @@
|
||||
gpu-screen-recorder
|
||||
gpu-screen-recorder-gtk
|
||||
# ungoogled-chromium
|
||||
];
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
dirs,
|
||||
userName,
|
||||
userEmail,
|
||||
ghostty,
|
||||
isNixOS,
|
||||
...
|
||||
}: {
|
||||
imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [
|
||||
../terminal.nix
|
||||
../broswer.nix
|
||||
../zellij.nix
|
||||
../lazygit.nix
|
||||
../k9s.nix
|
||||
../krew.nix
|
||||
../direnv.nix
|
||||
] ++ lib.optional isNixOS [
|
||||
../sway.nix
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
fh
|
||||
kubectl # kube config is deliberately not included
|
||||
kubectx
|
||||
obsidian
|
||||
vscode
|
||||
yt-dlp
|
||||
weechat
|
||||
nodejs
|
||||
cargo
|
||||
python3
|
||||
nixd
|
||||
deadnix
|
||||
alejandra
|
||||
statix
|
||||
];
|
||||
}
|
||||
|
||||
235
home/shell.nix
235
home/shell.nix
@@ -1,124 +1,125 @@
|
||||
{pkgs, lib, ...}: {
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
# initExtra = ''
|
||||
# export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
|
||||
# '';
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
userName,
|
||||
...
|
||||
}: {
|
||||
programs = {
|
||||
fish = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
# ls aliases
|
||||
ls = "eza --color";
|
||||
la = "eza -l -all --color";
|
||||
ll = "eza -l --color";
|
||||
lt = "eza -l --color --git";
|
||||
# lazygit alias
|
||||
lg = "lazygit";
|
||||
# cat, less, more alias
|
||||
cat = "bat";
|
||||
less = "bat";
|
||||
more = "bat";
|
||||
# top alias
|
||||
top = "btm";
|
||||
};
|
||||
functions =
|
||||
{
|
||||
fish_greeting = {
|
||||
body = ''
|
||||
set memes \
|
||||
"Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \
|
||||
"Daddy, chill!" \
|
||||
"What the hell is even that?!" \
|
||||
"Road work ahead? Yeah, I sure hope it does!" \
|
||||
"Look at all those chickens!" \
|
||||
"I smell like beef" \
|
||||
"Say, Coloardo - I'M A GIRAFFE" \
|
||||
"I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \
|
||||
"This is the dollar store, how good can it be?" \
|
||||
"That was legitness" \
|
||||
"Deez nuts" \
|
||||
"I wanna be a cowboy baby" \
|
||||
"Can I get a waffle? Can I please get a waffle?" \
|
||||
"I'm lesbian. I thought you were American." \
|
||||
"You gotta give 'em that 'hawk tuah' and spit on that thang!" \
|
||||
"We don't do that here..." \
|
||||
"What are those?! They are my crocs..." \
|
||||
"It's an avocado... Thanks!" \
|
||||
"I am once again asking for your financial support" \
|
||||
"Is that a weed?" \
|
||||
"No, this is Patrick!" \
|
||||
"Come ride, heroes, ride" \
|
||||
"Away with the tide" \
|
||||
"Concede your mind unto the fiend" \
|
||||
"Darkness come, rend the shield of light" \
|
||||
"The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
|
||||
"Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
|
||||
"Snap click clank whirr whizz wham boom!" \
|
||||
"Rohs an kyn ala na"
|
||||
|
||||
shellAliases = {
|
||||
# ls aliases
|
||||
ls = "eza --color";
|
||||
la = "eza -l -all --color";
|
||||
ll = "eza -l --color";
|
||||
lt = "eza -l --color --git";
|
||||
|
||||
# lazygit alias
|
||||
lg = "lazygit";
|
||||
|
||||
# cat, less, more alias
|
||||
cat = "bat";
|
||||
less = "bat";
|
||||
more = "bat";
|
||||
|
||||
# top alias
|
||||
top = "btm";
|
||||
set choose_meme (random)"%"(count $memes)
|
||||
set choose_meme $memes[(math $choose_meme"+1")]
|
||||
printf (set_color F90)"%s\n" $choose_meme
|
||||
'';
|
||||
# onEvent = "fish_greeting";
|
||||
};
|
||||
} // (lib.mkIf pkgs.stdenv.isLinux {
|
||||
block = {
|
||||
body = ''
|
||||
echo "Starting systemd-inhibit..."
|
||||
set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
|
||||
bash -c 'systemd-inhibit --no-ask-password --what=idle --who="'${userName}'" --why="manual invocation" sh & echo $! > '"$inhibit_pid_file"' && disown'
|
||||
if test -f $inhibit_pid_file
|
||||
set -g INHIBIT_PID (cat $inhibit_pid_file)
|
||||
echo "Inhibit process started with PID: $INHIBIT_PID"
|
||||
else
|
||||
echo "Failed to start inhibit process"
|
||||
return 1
|
||||
end
|
||||
'';
|
||||
};
|
||||
unblock = {
|
||||
body = ''
|
||||
set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
|
||||
if test -f $inhibit_pid_file
|
||||
set INHIBIT_PID (cat $inhibit_pid_file)
|
||||
echo "Killing inhibit process: $INHIBIT_PID"
|
||||
kill -SIGTERM $INHIBIT_PID 2>/dev/null; or kill -SIGKILL $INHIBIT_PID 2>/dev/null
|
||||
rm -f $inhibit_pid_file
|
||||
set -e INHIBIT_PID
|
||||
echo "Inhibit process terminated"
|
||||
else
|
||||
echo "No inhibit process file found"
|
||||
end
|
||||
'';
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
functions = {
|
||||
fish_greeting = {
|
||||
body = ''
|
||||
set memes \
|
||||
"Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \
|
||||
"Daddy, chill!" \
|
||||
"What the hell is even that?!" \
|
||||
"Road work ahead? Yeah, I sure hope it does!" \
|
||||
"Look at all those chickens!" \
|
||||
"I smell like beef" \
|
||||
"Say, Coloardo - I'M A GIRAFFE" \
|
||||
"I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \
|
||||
"This is the dollar store, how good can it be?" \
|
||||
"That was legitness" \
|
||||
"Deez nuts" \
|
||||
"I wanna be a cowboy baby" \
|
||||
"Can I get a waffle? Can I please get a waffle?" \
|
||||
"I'm lesbian. I thought you were American." \
|
||||
"You gotta give 'em that 'hawk tuah' and spit on that thang!" \
|
||||
"We don't do that here..." \
|
||||
"What are those?! They are my crocs..." \
|
||||
"It's an avocado... Thanks!" \
|
||||
"I am once again asking for your financial support" \
|
||||
"Is that a weed?" \
|
||||
"No, this is Patrick!" \
|
||||
"Come ride, heroes, ride" \
|
||||
"Away with the tide" \
|
||||
"Concede your mind unto the fiend" \
|
||||
"Darkness come, rend the shield of light" \
|
||||
"The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
|
||||
"Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
|
||||
"Snap click clank whirr whizz wham boom!" \
|
||||
"Rohs an kyn ala na" \
|
||||
"If you’ve brought your ivory standard, I’ll be happy to tell you where you can stick it" \
|
||||
"Speeches? Oh, yes, I love them. There's nothing like a good exposition when you're having trouble sleeping!" \
|
||||
"Somehow, the boy just isn't very buoyant" \
|
||||
"I am...not interested, little sun. Try again when you have become a man"
|
||||
|
||||
|
||||
set choose_meme (random)"%"(count $memes)
|
||||
set choose_meme $memes[(math $choose_meme"+1")]
|
||||
|
||||
printf (set_color F90)"%s\n" $choose_meme
|
||||
'';
|
||||
onEvent = "fish_greeting";
|
||||
};
|
||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
block = {
|
||||
body = ''
|
||||
systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
|
||||
set -g INHIBIT_PID $last_pid
|
||||
echo "Sleep inhibited. PID: $INHIBIT_PID"
|
||||
'';
|
||||
};
|
||||
|
||||
unblock = {
|
||||
body = ''
|
||||
if set -q INHIBIT_PID
|
||||
kill $INHIBIT_PID 2>/dev/null
|
||||
and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
|
||||
or echo "Failed to kill process or already terminated."
|
||||
set -e INHIBIT_PID
|
||||
zsh = {
|
||||
enable = true;
|
||||
initContent = ''
|
||||
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
||||
if [[ -n "$ZSH_VERSION" ]]; then
|
||||
LOGIN_OPTION="--login"
|
||||
else
|
||||
echo "No active sleep inhibitor found."
|
||||
end
|
||||
'';
|
||||
};
|
||||
LOGIN_OPTION=""
|
||||
fi
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
initContent = ''
|
||||
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
||||
if [[ -n "$ZSH_VERSION" ]]; then
|
||||
LOGIN_OPTION="--login"
|
||||
else
|
||||
LOGIN_OPTION=""
|
||||
bash = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
||||
if [[ -n "$ZSH_VERSION" ]]; then
|
||||
LOGIN_OPTION="--login"
|
||||
else
|
||||
LOGIN_OPTION=""
|
||||
fi
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
if [[ -z "$BASH_EXECUTION_STRING" ]]; then
|
||||
if [[ -n "$ZSH_VERSION" ]]; then
|
||||
LOGIN_OPTION="--login"
|
||||
else
|
||||
LOGIN_OPTION=""
|
||||
fi
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ghostty, ... }: {
|
||||
{ lib, pkgs, ghostty, ... }: {
|
||||
programs.alacritty = {
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
settings = {
|
||||
|
||||
@@ -8,9 +8,6 @@
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"mbedtls-2.28.10"
|
||||
];
|
||||
|
||||
nix.package = pkgs.nix;
|
||||
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{ ... }: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./core.nix
|
||||
./environment.nix
|
||||
./fonts.nix
|
||||
# ./overlays.nix
|
||||
./users.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,23 +1,20 @@
|
||||
{ lib, pkgs, ... }: {
|
||||
# Common packages that every system will use
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
vim
|
||||
neovim
|
||||
usbutils
|
||||
coreutils
|
||||
lshw
|
||||
systemd
|
||||
dmidecode
|
||||
pciutils
|
||||
nix-ld
|
||||
patchelf
|
||||
htop
|
||||
] ++
|
||||
lib.optionals pkgs.stdenv.isLinux (with pkgs; [
|
||||
systemd
|
||||
lshw
|
||||
dmidecode
|
||||
nix-ld
|
||||
]) ++
|
||||
lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
|
||||
# nothing here, yet ;)
|
||||
]);
|
||||
];
|
||||
|
||||
# Common environment variables that every system will use
|
||||
environment.variables.EDITOR = "nvim";
|
||||
}
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
final: prev: let
|
||||
rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
|
||||
myRustPlatform = prev.makeRustPlatform {
|
||||
cargo = rust_1_90_0;
|
||||
rustc = rust_1_90_0;
|
||||
};
|
||||
in {
|
||||
lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
|
||||
version = "0.55.1";
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = "lazygit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
|
||||
};
|
||||
vendorHash = null;
|
||||
subPackages = [ "." ];
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
"-X main.buildSource=nix"
|
||||
];
|
||||
});
|
||||
|
||||
atuinLatest = (prev.atuin.override {
|
||||
rustPlatform = myRustPlatform;
|
||||
}).overrideAttrs (oldAttrs: rec {
|
||||
version = "18.10.0";
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
|
||||
};
|
||||
|
||||
cargoDeps = myRustPlatform.fetchCargoVendor {
|
||||
# name = "atuin-${version}-vendor.tar.gz";
|
||||
inherit src;
|
||||
hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
|
||||
};
|
||||
|
||||
preCheck = (oldAttrs.preCheck or "") + ''
|
||||
export HOME="$TMPDIR"
|
||||
export XDG_CONFIG_HOME="$TMPDIR/.config"
|
||||
export XDG_DATA_HOME="$TMPDIR/.local/share"
|
||||
export XDG_STATE_HOME="$TMPDIR/.local/state"
|
||||
mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
|
||||
'';
|
||||
});
|
||||
|
||||
k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
|
||||
version = "0.30.16";
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
|
||||
};
|
||||
ldflags = [
|
||||
"-X github.com/derailed/k9s/version.Version=${version}"
|
||||
"-X github.com/derailed/k9s/version.BuildSource=nix"
|
||||
];
|
||||
});
|
||||
}
|
||||
@@ -1,23 +1,30 @@
|
||||
{ lib, pkgs, userName, hostname, ... }:
|
||||
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
userName,
|
||||
hostname,
|
||||
...
|
||||
} @ args: {
|
||||
networking.hostName = hostname;
|
||||
|
||||
users.users."${userName}" = {
|
||||
home = if pkgs.stdenv.isDarwin
|
||||
then "/Users/${userName}"
|
||||
else "/home/${userName}";
|
||||
description = userName;
|
||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
group = "${userName}";
|
||||
isNormalUser = true;
|
||||
};
|
||||
# Don't forget to set a password with ‘passwd’!
|
||||
users.users."${userName}" = lib.mkMerge [
|
||||
{
|
||||
home =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then "/Users/${userName}"
|
||||
else "/home/${userName}";
|
||||
description = userName;
|
||||
}
|
||||
|
||||
users.groups.wyatt = {};
|
||||
nix.settings.trusted-users = [userName];
|
||||
(lib.mkIf (pkgs.stdenv.isLinux) {
|
||||
group = "${userName}";
|
||||
isNormalUser = true;
|
||||
})
|
||||
];
|
||||
|
||||
security = lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
sudo.extraRules = [
|
||||
security.sudo = {
|
||||
extraRules = [
|
||||
{
|
||||
groups = [ "wheel" ];
|
||||
commands = [
|
||||
@@ -30,9 +37,7 @@
|
||||
];
|
||||
};
|
||||
|
||||
environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||
etc."sudoers.d/wheel-nopasswd".text = ''
|
||||
%wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
|
||||
'';
|
||||
};
|
||||
users.groups.wyatt = {};
|
||||
|
||||
nix.settings.trusted-users = [userName];
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
in {
|
||||
imports = [
|
||||
(import ../../apps/flatpak.nix {
|
||||
inherit lib pkgs flatpakPackages userName;
|
||||
inherit lib pkgs flatpakPackages;
|
||||
})
|
||||
../../apps/gaming.nix
|
||||
../../apps/appimage.nix
|
||||
|
||||
@@ -12,24 +12,24 @@
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
|
||||
device = "/dev/disk/by-label/COMPUTER";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/B72F-087F";
|
||||
device = "/dev/disk/by-label/BOOT";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
|
||||
{device = "/dev/disk/by-label/SWAP";}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
with lib; {
|
||||
options = {
|
||||
security.sudoers = {
|
||||
security.sudo = {
|
||||
needsPassword = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
|
||||
@@ -1,16 +1,7 @@
|
||||
{ lib, pkgs, userName, ...}: {
|
||||
{pkgs, ...}: {
|
||||
services.shairport-sync = {
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
openFirewall = pkgs.stdenv.isLinux;
|
||||
# arguments = "-v -o pa";
|
||||
};
|
||||
|
||||
systemd.services.shairport-sync = {
|
||||
serviceConfig = {
|
||||
User = lib.mkForce "${userName}";
|
||||
};
|
||||
environment = {
|
||||
XDG_RUNTIME_DIR = "/run/user/1000";
|
||||
};
|
||||
arguments = "-v -o pw";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user