Compare commits
13 Commits
neovim
...
standalone
Author | SHA1 | Date | |
---|---|---|---|
ba66937ee3 | |||
a3c53820b1 | |||
8cbdeb4cdc | |||
bfa957adcd | |||
50d22afef8 | |||
29feb9223e | |||
7bc7749f51 | |||
93052529b8 | |||
51beed138e | |||
faed026258 | |||
3af5061a79 | |||
ddd3fb39e4 | |||
6ff4e13b03 |
@@ -7,37 +7,41 @@ set $down j
|
|||||||
set $up k
|
set $up k
|
||||||
set $right l
|
set $right l
|
||||||
# Alacritty
|
# Alacritty
|
||||||
set $term alacritty
|
set $term foot
|
||||||
|
|
||||||
# Menu (rofi)
|
# Menu (rofi)
|
||||||
set $menu wofi --term '$term'
|
set $menu wofi --show
|
||||||
|
|
||||||
### Output configuration
|
# ### Output configuration
|
||||||
output DP-3 pos 3840 0 res 1920x1080@59Hz
|
# output DP-3 pos 3840 0 res 1920x1080@59Hz
|
||||||
output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
|
# output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
|
||||||
output DP-2 pos 1920 0 res 1920x1080@60Hz
|
# output DP-2 pos 1920 0 res 1920x1080@60Hz
|
||||||
|
|
||||||
### Wallpaper
|
### Wallpaper
|
||||||
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
output * bg ~/.wallpaper/.wallpaper.png fill
|
||||||
output DP-2 bg ~/.wallpaper/.wallpaper.png fill
|
# output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
||||||
output DP-3 bg ~/.wallpaper/.wallpaper.png fill
|
# output DP-2 bg ~/.wallpaper/.wallpaper.png fill
|
||||||
|
# output DP-3 bg ~/.wallpaper/.wallpaper.png fill
|
||||||
|
|
||||||
### Workspace binding
|
### Workspace binding
|
||||||
|
|
||||||
## DP-3 bindings
|
## DP-3 bindings
|
||||||
workspace 1 output DP-2
|
# workspace 1 output DP-2
|
||||||
workspace 2 output DP-2
|
# workspace 2 output DP-2
|
||||||
workspace 4 output DP-2
|
# workspace 4 output DP-2
|
||||||
workspace 5 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-3
|
||||||
|
# workspace 7 output DP-3
|
||||||
|
# workspace 8 output DP-3
|
||||||
|
|
||||||
## HDMI-A-1 bindings
|
## eDP-1 bindings scale
|
||||||
workspace 3 output HDMI-A-1
|
output eDP-1 scale 1.25
|
||||||
workspace 9 output HDMI-A-1
|
|
||||||
|
|
||||||
## DP-2 bindings
|
|
||||||
workspace 6 output DP-3
|
|
||||||
workspace 7 output DP-3
|
|
||||||
workspace 8 output DP-3
|
|
||||||
|
|
||||||
### Colour options
|
### Colour options
|
||||||
set $bg #24283b
|
set $bg #24283b
|
||||||
@@ -228,10 +232,4 @@ set $opacity 1.00
|
|||||||
for_window [class=".*"] opacity $opacity
|
for_window [class=".*"] opacity $opacity
|
||||||
for_window [app_id=".*"] opacity $opacity
|
for_window [app_id=".*"] opacity $opacity
|
||||||
|
|
||||||
# Disable locking when conditions are met
|
|
||||||
for_window [class="streaming_client"] inhibit_idle fullscreen
|
|
||||||
for_window [app_id="firefox"] inhibit_idle fullscreen
|
|
||||||
for_window [app_id="neovide"] inhibit_idle fullscreen
|
|
||||||
|
|
||||||
for_window [title="Beyond All Reason"] inhibit_idle fullscreen
|
|
||||||
include /etc/sway/config.d/*
|
include /etc/sway/config.d/*
|
||||||
|
127
flake.lock
generated
127
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749744770,
|
"lastModified": 1757432263,
|
||||||
"narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
|
"narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
|
"rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -55,6 +55,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_2": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"ghostty": {
|
"ghostty": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
@@ -64,11 +82,11 @@
|
|||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751123364,
|
"lastModified": 1759330332,
|
||||||
"narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=",
|
"narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5",
|
"rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -84,11 +102,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750792728,
|
"lastModified": 1758463745,
|
||||||
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
|
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
|
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -114,6 +132,25 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixgl": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_2",
|
||||||
|
"nixpkgs": "nixpkgs_3"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1752054764,
|
||||||
|
"narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
|
||||||
|
"owner": "guibou",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "guibou",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748189127,
|
"lastModified": 1748189127,
|
||||||
@@ -129,11 +166,39 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750969886,
|
"lastModified": 1758360447,
|
||||||
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
|
"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": 1746378225,
|
||||||
|
"narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
|
"rev": "93e8cdce7afc64297cfec447c311470788131cd9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1759281824,
|
||||||
|
"narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -149,7 +214,8 @@
|
|||||||
"ghostty": "ghostty",
|
"ghostty": "ghostty",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-flatpak": "nix-flatpak",
|
"nix-flatpak": "nix-flatpak",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixgl": "nixgl",
|
||||||
|
"nixpkgs": "nixpkgs_4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
@@ -167,10 +233,26 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"zig": {
|
"zig": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
"ghostty"
|
"ghostty",
|
||||||
|
"flake-compat"
|
||||||
],
|
],
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"ghostty",
|
"ghostty",
|
||||||
@@ -197,27 +279,20 @@
|
|||||||
},
|
},
|
||||||
"zon2nix": {
|
"zon2nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"nixpkgs": "nixpkgs_2"
|
||||||
"ghostty",
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"ghostty",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742104771,
|
"lastModified": 1758405547,
|
||||||
"narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
|
"narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
|
||||||
"owner": "jcollie",
|
"owner": "jcollie",
|
||||||
"repo": "zon2nix",
|
"repo": "zon2nix",
|
||||||
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "jcollie",
|
"owner": "jcollie",
|
||||||
"ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
|
||||||
"repo": "zon2nix",
|
"repo": "zon2nix",
|
||||||
|
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
14
flake.nix
14
flake.nix
@@ -12,6 +12,7 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
ghostty.url = "github:ghostty-org/ghostty";
|
ghostty.url = "github:ghostty-org/ghostty";
|
||||||
|
nixgl.url = "github:guibou/nixGL";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
@@ -21,6 +22,7 @@
|
|||||||
darwin,
|
darwin,
|
||||||
home-manager,
|
home-manager,
|
||||||
ghostty,
|
ghostty,
|
||||||
|
nixgl,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
userName = "wyatt";
|
userName = "wyatt";
|
||||||
@@ -129,5 +131,17 @@
|
|||||||
# }
|
# }
|
||||||
# ];
|
# ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# For anyone running home-manager standalone
|
||||||
|
homeConfigurations.${userName} = home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
modules = [
|
||||||
|
./home
|
||||||
|
];
|
||||||
|
# Optionally, pass specialArgs if needed
|
||||||
|
extraSpecialArgs = extraSpecialArgs // {
|
||||||
|
inherit nixgl;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -38,14 +38,14 @@
|
|||||||
(createChromiumExtension {
|
(createChromiumExtension {
|
||||||
# ublock origin
|
# ublock origin
|
||||||
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
||||||
sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
|
sha256 = "sha256:054kqrai2kd89bzc5c3x17rjfdil2zzxrxrg65vaywmvm77y7kmn";
|
||||||
# sha256 = lib.fakeSha256;
|
# sha256 = lib.fakeSha256;
|
||||||
version = "1.64.0";
|
version = "1.64.0";
|
||||||
})
|
})
|
||||||
(createChromiumExtension {
|
(createChromiumExtension {
|
||||||
# bitwarden
|
# bitwarden
|
||||||
id = "nngceckbapebfimnlniiiahkandclblb";
|
id = "nngceckbapebfimnlniiiahkandclblb";
|
||||||
sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
|
sha256 = "sha256:02cscadjqbfx3a5bky1zc38pxymzgndb9h3wing3pb0fwm30yrzd";
|
||||||
# sha256 = lib.fakeSha256;
|
# sha256 = lib.fakeSha256;
|
||||||
version = "2025.5.0";
|
version = "2025.5.0";
|
||||||
})
|
})
|
||||||
|
@@ -27,6 +27,7 @@ in {
|
|||||||
./browser.nix
|
./browser.nix
|
||||||
./zellij.nix
|
./zellij.nix
|
||||||
./bat.nix
|
./bat.nix
|
||||||
|
./fonts.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager needs a bit of information about you and the
|
# Home Manager needs a bit of information about you and the
|
||||||
@@ -39,9 +40,9 @@ in {
|
|||||||
else "/home/${userName}";
|
else "/home/${userName}";
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
XDG_CURRENT_DESKTOP = "sway";
|
XDG_CURRENT_DESKTOP = "gnome";
|
||||||
XDG_SESSION_TYPE = "wayland";
|
XDG_SESSION_TYPE = "wayland";
|
||||||
XDG_SESSION_DESKTOP="sway";
|
XDG_SESSION_DESKTOP="gnome";
|
||||||
XDG_CONFIG_HOME = "$HOME/.config";
|
XDG_CONFIG_HOME = "$HOME/.config";
|
||||||
XDG_CACHE_HOME = "$HOME/.cache";
|
XDG_CACHE_HOME = "$HOME/.cache";
|
||||||
XDG_DATA_HOME = "$HOME/.local/share";
|
XDG_DATA_HOME = "$HOME/.local/share";
|
||||||
|
16
home/fonts.nix
Normal file
16
home/fonts.nix
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
fonts.fontconfig.enable = true;
|
||||||
|
home.packages = with pkgs;
|
||||||
|
[
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-emoji
|
||||||
|
liberation_ttf
|
||||||
|
noto-fonts-cjk-sans
|
||||||
|
monaspace
|
||||||
|
]
|
||||||
|
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
|
||||||
|
}
|
@@ -15,7 +15,7 @@
|
|||||||
extraConfig = {
|
extraConfig = {
|
||||||
init.defaultBranch = "master";
|
init.defaultBranch = "master";
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
pull.merge = true;
|
pull.rebase = false;
|
||||||
merge.tool = "nvimdiff";
|
merge.tool = "nvimdiff";
|
||||||
mergetool.keepBackup = false;
|
mergetool.keepBackup = false;
|
||||||
};
|
};
|
||||||
|
@@ -39,9 +39,13 @@
|
|||||||
babelfish
|
babelfish
|
||||||
|
|
||||||
# language-specific package managers
|
# language-specific package managers
|
||||||
nodejs
|
# nodejs
|
||||||
|
fnm
|
||||||
cargo
|
cargo
|
||||||
python3
|
python3
|
||||||
|
python312Packages.gyp
|
||||||
|
node-gyp
|
||||||
|
node-pre-gyp
|
||||||
|
|
||||||
# nix specific stuff
|
# nix specific stuff
|
||||||
nixd
|
nixd
|
||||||
|
@@ -5,16 +5,19 @@
|
|||||||
}: {
|
}: {
|
||||||
home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
|
home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
|
||||||
imv
|
imv
|
||||||
betterdiscordctl
|
# betterdiscordctl
|
||||||
vesktop
|
# vesktop
|
||||||
xdg-utils
|
xdg-utils
|
||||||
mcrcon
|
|
||||||
xfce.thunar
|
xfce.thunar
|
||||||
pavucontrol
|
pavucontrol
|
||||||
godot
|
# godot
|
||||||
aseprite
|
# aseprite
|
||||||
gpu-screen-recorder
|
gpu-screen-recorder
|
||||||
gpu-screen-recorder-gtk
|
gpu-screen-recorder-gtk
|
||||||
# ungoogled-chromium
|
# ungoogled-chromium
|
||||||
|
playerctl
|
||||||
|
light
|
||||||
|
brightnessctl
|
||||||
|
wttrbar
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, lib, ...}: {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# initExtra = ''
|
shellInit = ''
|
||||||
# export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
|
fnm env --use-on-cd --shell fish | source
|
||||||
# '';
|
'';
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
# ls aliases
|
# ls aliases
|
||||||
@@ -52,6 +52,27 @@
|
|||||||
'';
|
'';
|
||||||
onEvent = "fish_greeting";
|
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
|
||||||
|
else
|
||||||
|
echo "No active sleep inhibitor found."
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -147,20 +147,5 @@ in {
|
|||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
|
||||||
package = pkgs.waybar.overrideAttrs (old: {
|
|
||||||
version = "0.11.0";
|
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "Alexays";
|
|
||||||
repo = "Waybar";
|
|
||||||
rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
|
|
||||||
sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
|
|
||||||
# mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -100,8 +100,51 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.kitty = {
|
|
||||||
enable = false; # TODO: to enable later
|
programs.foot = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
main = {
|
||||||
|
font = "Monaspace Argon:size=11";
|
||||||
|
};
|
||||||
|
colors = {
|
||||||
|
alpha = 0.9;
|
||||||
|
|
||||||
|
cursor = "11111b f5e0dc";
|
||||||
|
foreground = "cdd6f4";
|
||||||
|
background = "1e1e2e";
|
||||||
|
|
||||||
|
regular0 = "45475a";
|
||||||
|
regular1 = "f38ba8";
|
||||||
|
regular2 = "a6e3a1";
|
||||||
|
regular3 = "f9e2af";
|
||||||
|
regular4 = "89b4fa";
|
||||||
|
regular5 = "f5c2e7";
|
||||||
|
regular6 = "94e2d5";
|
||||||
|
regular7 = "bac2de";
|
||||||
|
|
||||||
|
bright0 = "585b70";
|
||||||
|
bright1 = "f38ba8";
|
||||||
|
bright2 = "a6e3a1";
|
||||||
|
bright3 = "f9e2af";
|
||||||
|
bright4 = "89b4fa";
|
||||||
|
bright5 = "f5c2e7";
|
||||||
|
bright6 = "94e2d5";
|
||||||
|
bright7 = "a6adc8";
|
||||||
|
|
||||||
|
"16" = "fab387";
|
||||||
|
"17" = "f5e0dc";
|
||||||
|
|
||||||
|
selection-foreground = "cdd6f4";
|
||||||
|
selection-background = "414356";
|
||||||
|
|
||||||
|
search-box-no-match = "11111b f38ba8";
|
||||||
|
search-box-match = "cdd6f4 313244";
|
||||||
|
|
||||||
|
jump-labels = "11111b fab387";
|
||||||
|
urls = "89b4fa";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = if pkgs.stdenv.isLinux then
|
home.packages = if pkgs.stdenv.isLinux then
|
||||||
|
19
modules/apps/appimage.nix
Normal file
19
modules/apps/appimage.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.appimage;
|
||||||
|
in {
|
||||||
|
options.appimage = {
|
||||||
|
enable = mkEnableOption "AppImage support";
|
||||||
|
};
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
appimageupdate
|
||||||
|
appimage-run
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
@@ -1,20 +1,23 @@
|
|||||||
{ lib, pkgs, ... }: {
|
{ lib, pkgs, ... }: {
|
||||||
# Common packages that every system will use
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
git
|
git
|
||||||
vim
|
vim
|
||||||
neovim
|
neovim
|
||||||
usbutils
|
usbutils
|
||||||
coreutils
|
coreutils
|
||||||
lshw
|
|
||||||
systemd
|
|
||||||
dmidecode
|
|
||||||
pciutils
|
pciutils
|
||||||
nix-ld
|
|
||||||
patchelf
|
patchelf
|
||||||
htop
|
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";
|
environment.variables.EDITOR = "nvim";
|
||||||
}
|
}
|
||||||
|
@@ -1,30 +1,23 @@
|
|||||||
|
{ lib, pkgs, userName, hostname, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
userName,
|
|
||||||
hostname,
|
|
||||||
...
|
|
||||||
} @ args: {
|
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
|
|
||||||
# Don't forget to set a password with ‘passwd’!
|
users.users."${userName}" = {
|
||||||
users.users."${userName}" = lib.mkMerge [
|
home = if pkgs.stdenv.isDarwin
|
||||||
{
|
|
||||||
home =
|
|
||||||
if pkgs.stdenv.isDarwin
|
|
||||||
then "/Users/${userName}"
|
then "/Users/${userName}"
|
||||||
else "/home/${userName}";
|
else "/home/${userName}";
|
||||||
description = userName;
|
description = userName;
|
||||||
}
|
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
|
|
||||||
(lib.mkIf (pkgs.stdenv.isLinux) {
|
|
||||||
group = "${userName}";
|
group = "${userName}";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
})
|
};
|
||||||
];
|
|
||||||
|
|
||||||
security.sudo = {
|
users.groups.wyatt = {};
|
||||||
extraRules = [
|
nix.settings.trusted-users = [userName];
|
||||||
|
|
||||||
|
security = lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
|
sudo.extraRules = [
|
||||||
{
|
{
|
||||||
groups = [ "wheel" ];
|
groups = [ "wheel" ];
|
||||||
commands = [
|
commands = [
|
||||||
@@ -37,7 +30,9 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
users.groups.wyatt = {};
|
environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||||
|
etc."sudoers.d/wheel-nopasswd".text = ''
|
||||||
nix.settings.trusted-users = [userName];
|
%wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@@ -21,11 +21,13 @@ in {
|
|||||||
inherit lib pkgs flatpakPackages;
|
inherit lib pkgs flatpakPackages;
|
||||||
})
|
})
|
||||||
../../apps/gaming.nix
|
../../apps/gaming.nix
|
||||||
|
../../apps/appimage.nix
|
||||||
../../graphics
|
../../graphics
|
||||||
../../pwrMgmt
|
../../pwrMgmt
|
||||||
../../networking/core.nix
|
../../networking/core.nix
|
||||||
../../sound/pipewire.nix
|
../../sound/pipewire.nix
|
||||||
../../sound/shairport.nix
|
../../sound/shairport.nix
|
||||||
|
../../sound/focusrite.nix
|
||||||
../../virtualization/podman.nix
|
../../virtualization/podman.nix
|
||||||
../../virtualization/hardware.nix
|
../../virtualization/hardware.nix
|
||||||
];
|
];
|
||||||
@@ -34,9 +36,13 @@ in {
|
|||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
# Custom kernel/boot stuff
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot = {
|
||||||
boot.loader.systemd-boot.enable = true;
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
loader = {
|
||||||
|
systemd-boot.enable = true;
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Enable Bluetooth if present
|
# Enable Bluetooth if present
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
@@ -63,21 +69,6 @@ in {
|
|||||||
wl-clip-persist
|
wl-clip-persist
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable OpenSSH
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Enable keyring
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# Enable GnuPG
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable SUID wrappers (some programs need them)
|
|
||||||
programs.mtr.enable = true;
|
|
||||||
|
|
||||||
# Enable Polkit
|
# Enable Polkit
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
@@ -145,14 +136,39 @@ in {
|
|||||||
networkManager.enable = true;
|
networkManager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
# Enable GnuPG
|
||||||
|
gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable SUID wrappers (some programs need them)
|
||||||
|
mtr.enable = true;
|
||||||
|
|
||||||
# Enable dconf
|
# Enable dconf
|
||||||
programs.dconf.enable = true;
|
dconf.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Add username to groups "wheel" and "video" - more may be added here later
|
# Add username to groups "wheel" and "video" - more may be added here later
|
||||||
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
||||||
|
|
||||||
|
services = {
|
||||||
|
# Enable OpenSSH
|
||||||
|
openssh.enable = true;
|
||||||
|
|
||||||
|
# Enable keyring
|
||||||
|
gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
# Flatpak packages (see ../../apps/flatpak.nix)
|
# Flatpak packages (see ../../apps/flatpak.nix)
|
||||||
services.flatpak.packages = flatpakPackages;
|
flatpak.packages = flatpakPackages;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
|
||||||
|
sound.hardware.focusrite.enable = true;
|
||||||
|
|
||||||
|
# AppImage support
|
||||||
|
appimage.enable = true;
|
||||||
|
|
||||||
# XDG stuff
|
# XDG stuff
|
||||||
xdg = {
|
xdg = {
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
}:
|
}:
|
||||||
with lib; {
|
with lib; {
|
||||||
options = {
|
options = {
|
||||||
security.sudo = {
|
security.sudoers = {
|
||||||
needsPassword = mkOption {
|
needsPassword = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
|
33
modules/sound/focusrite.nix
Normal file
33
modules/sound/focusrite.nix
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
# Must be paired with the pipewire Nix module, this does nothing but install packages
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.sound.hardware.focusrite;
|
||||||
|
in {
|
||||||
|
options.sound.hardware.focusrite = {
|
||||||
|
enable = mkEnableOption "Focusrite audio interface support";
|
||||||
|
guiSupport = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
config = mkIf cfg.enable (mkMerge [
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs;
|
||||||
|
[
|
||||||
|
scarlett2
|
||||||
|
alsa-scarlett-gui
|
||||||
|
]
|
||||||
|
++ (
|
||||||
|
if cfg.guiSupport
|
||||||
|
then [pkgs.alsa-scarlett-gui]
|
||||||
|
else []
|
||||||
|
);
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
}
|
Reference in New Issue
Block a user