zoey/config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

add sway

Browse source
This commit is contained in:
zack 2024-08-07 10:44:50 -04:00
parent b50deaf53c
commit 663c9608d0
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
13 changed files with 331 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

297
flake.lock generated
View file

@ -214,6 +214,21 @@
}
},
"flake-compat_4": {
"locked": {
"lastModified": 1717312683,
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1650374568,
@ -229,7 +244,7 @@
"type": "github"
}
},
"flake-compat_5": {
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -245,7 +260,7 @@
"type": "github"
}
},
"flake-compat_6": {
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -347,7 +362,29 @@
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
"nixpkgs-lib": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1722555600,
@ -383,7 +420,7 @@
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils_4"
"flake-utils": "flake-utils_5"
},
"locked": {
"lastModified": 1715533576,
@ -438,7 +475,25 @@
},
"flake-utils_4": {
"inputs": {
"systems": "systems_12"
"systems": "systems_10"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_13"
},
"locked": {
"lastModified": 1694529238,
@ -647,7 +702,9 @@
"hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_7",
"xdph": "xdph"
},
@ -880,6 +937,25 @@
"type": "github"
}
},
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1722773431,
"narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "04a4b4d84e02590715e753da3d35fb03cddc6425",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "lib-aggregate",
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
@ -887,7 +963,7 @@
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1722865783,
@ -919,6 +995,49 @@
"type": "github"
}
},
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_5",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_7",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721505437,
"narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1722732880,
@ -972,6 +1091,21 @@
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1722732880,
"narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "8bebd4c74f368aacb047f0141db09ec6b339733c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1722555339,
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
@ -999,6 +1133,43 @@
"type": "github"
}
},
"nixpkgs-wayland": {
"inputs": {
"flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1722968688,
"narHash": "sha256-M9/2S8I6XsAMt4okYUpGnhuFpAwgFy7Z5aN6Hpprslc=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "c43398f6e76cb28d4523b4e300ff83c40c021f18",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1718428119,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712883908,
@ -1032,22 +1203,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -1063,7 +1218,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1722640603,
"narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
@ -1079,7 +1234,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1722630782,
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
@ -1095,13 +1250,13 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_7": {
"locked": {
"lastModified": 1712883908,
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
"lastModified": 1720781449,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9",
"rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
"type": "github"
},
"original": {
@ -1111,13 +1266,29 @@
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1718428119,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
"lastModified": 1712883908,
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
"rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9",
"type": "github"
},
"original": {
@ -1179,8 +1350,8 @@
},
"resume": {
"inputs": {
"nixpkgs": "nixpkgs_8",
"systems": "systems_10"
"nixpkgs": "nixpkgs_9",
"systems": "systems_11"
},
"locked": {
"lastModified": 1721842409,
@ -1198,12 +1369,12 @@
},
"rio-term": {
"inputs": {
"flake-parts": "flake-parts_5",
"flake-parts": "flake-parts_6",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_3",
"systems": "systems_11"
"systems": "systems_12"
},
"locked": {
"lastModified": 1722882318,
@ -1233,19 +1404,20 @@
"lanzaboote": "lanzaboote",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_6",
"nixpkgs-wayland": "nixpkgs-wayland",
"resume": "resume",
"rio-term": "rio-term",
"snowfall-lib": "snowfall-lib",
"spicetify-nix": "spicetify-nix",
"systems": "systems_13",
"systems": "systems_14",
"waybar": "waybar"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1709259239,
@ -1288,7 +1460,7 @@
},
"rust-overlay_3": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1722651535,
@ -1306,7 +1478,7 @@
},
"snowfall-lib": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_5",
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": [
"nixpkgs"
@ -1328,7 +1500,7 @@
},
"spicetify-nix": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_6",
"nixpkgs": [
"nixpkgs"
]
@ -1378,7 +1550,6 @@
}
},
"systems_11": {
"flake": false,
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1394,6 +1565,7 @@
}
},
"systems_12": {
"flake": false,
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1423,6 +1595,21 @@
"type": "github"
}
},
"systems_14": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
@ -1543,9 +1730,31 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720930114,
"narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "b92afa1501ac73f1d745526adc4f89b527595f14",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"waybar": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_7",
"nixpkgs": [
"nixpkgs"
]

5
flake.nix
View file

@ -18,6 +18,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
resume.url = "git+https://git.zackster.zip/zack/resume";
anyrun.url = "github:Kirottu/anyrun";
anyrun.inputs.nixpkgs.follows = "nixpkgs";
@ -49,6 +51,7 @@
hyprland = {
url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
};
kb-gui = {
@ -98,7 +101,7 @@
inherit inputs;
src = ./.;
overlays = [inputs.neovim-nightly-overlay.overlays.default];
overlays = [inputs.neovim-nightly-overlay.overlays.default inputs.nixpkgs-wayland.overlay];
snowfall = {
namespace = "custom";

4
homes/x86_64-linux/zoey@earth/default.nix
View file

@ -23,6 +23,7 @@
tools.gh.enable = true;
term.kitty.enable = true;
term.foot.enable = true;
music.spotify.enable = true;
@ -101,6 +102,9 @@
pkgs.zed-editor
pkgs.openvpn
pkgs.telegram-desktop
pkgs.linux-manual
pkgs.man-pages
pkgs.man-pages-posix
];
programs.zoxide = {

4
modules/home/apps/helpers/ags/default.nix
View file

@ -27,8 +27,8 @@ with lib.custom; let
accountsservice
swww
gnome.gnome-control-center
gnome.nautilus
gnome.totem
nautilus
totem
loupe
];

20
modules/home/apps/term/foot/default.nix Normal file
View file

@ -0,0 +1,20 @@
{
lib,
config,
pkgs,
...
}:
with lib;
with lib.custom; let
cfg = config.apps.term.foot;
in {
options.apps.term.foot = with types; {
enable = mkBoolOpt false "Enable Foot Terminal";
};
config = mkIf cfg.enable {
programs.foot = {
enable = true;
};
};
}

5
modules/home/apps/tools/neovim/default.nix
View file

@ -39,18 +39,13 @@ in {
defaultEditor = true;
extraPackages = with pkgs; [
# Formatters
alejandra # Nix
black # Python
prettierd # Multi-language
shfmt
isort
stylua
rustywind
# LSP
lua-language-server
nixd
rust-analyzer
vscode-langservers-extracted
nodePackages.vscode-json-languageserver
nodePackages.typescript-language-server

10
modules/home/shells/zsh/aliases.nix
View file

@ -28,6 +28,16 @@ with pkgs; {
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
tree = "${getExe eza} --tree --icons --tree";
kys = "shutdown now";
w = ''| nvim -c "setlocal buftype=nofile bufhidden=wipe" -c "nnoremap <buffer> q :q!<CR>" -'';
lv = "nvim -c \"normal '\''0\"";
pf = ''
fzf --bind ctrl-y:preview-up,ctrl-e:preview-down \
--bind ctrl-b:preview-page-up,ctrl-f:preview-page-down \
--bind ctrl-u:preview-half-page-up,ctrl-d:preview-half-page-down \
--bind ctrl-k:up,ctrl-j:down \
--preview='bat --style=numbers --color=always --line-range :100 {}'
'';
ff = "for file in \`pf\`; do cmd=\"v \$file\" && print -rs -- \$cmd && eval \$cmd; done";
gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE";
agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE";
tsm = "transmission-remote";

1
modules/home/shells/zsh/default.nix
View file

@ -42,6 +42,7 @@ in {
"${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh"
"${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh"
"${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh"
"${oh-my-zsh}/share/oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh"
];
source = map (source: "source ${source}") sources;

2
modules/home/wms/sway/default.nix
View file

@ -2,6 +2,7 @@
lib,
config,
pkgs,
inputs,
...
}:
with lib;
@ -22,7 +23,6 @@ in {
wayland.windowManager.sway = {
enable = true;
xwayland = true;
package = pkgs.swayfx;
extraOptions = ["--unsupported-gpu"];
config = {

3
modules/nixos/protocols/wayland/default.nix
View file

@ -16,7 +16,6 @@ in {
config = mkIf cfg.enable {
environment.etc."greetd/environments".text = ''
bspwm
Hyprland
sway
'';
@ -36,7 +35,7 @@ in {
environment = {
variables = {
# NIXOS_OZONE_WL = "0";
# NIXOS_OZONE_WL = "1";
__GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "0";
_JAVA_AWT_WM_NONEREPARENTING = "1";

26
modules/nixos/sites/pterodactyl/default.nix
View file

@ -45,7 +45,7 @@ in {
systemd.services."p_artisan-run" = {
script = ''
${pkgs.php}/bin/php /var/www/pterodactyl/artisan schedule:run >> /dev/null 2>&1
${pkgs.php83}/bin/php /var/www/pterodactyl/artisan schedule:run >> /dev/null 2>&1
'';
serviceConfig = {
Type = "oneshot";
@ -79,7 +79,7 @@ in {
after = ["redis.service"];
wantedBy = ["multi-user.target"];
script = ''
${pkgs.php}/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
${pkgs.php83}/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
'';
serviceConfig = {
User = "nginx";
@ -150,20 +150,20 @@ in {
services.phpfpm = {
phpOptions = ''
extension=${pkgs.php81Extensions.openssl}/lib/php/extensions/openssl.so
extension=${pkgs.php81Extensions.gd}/lib/php/extensions/gd.so
extension=${pkgs.php81Extensions.mysqlnd}/lib/php/extensions/mysqlnd.so
extension=${pkgs.php81Extensions.mbstring}/lib/php/extensions/mbstring.so
extension=${pkgs.php81Extensions.tokenizer}/lib/php/extensions/tokenizer.so
extension=${pkgs.php81Extensions.bcmath}/lib/php/extensions/bcmath.so
extension=${pkgs.php81Extensions.xml}/lib/php/extensions/xml.so
extension=${pkgs.php81Extensions.dom}/lib/php/extensions/dom.so
extension=${pkgs.php81Extensions.curl}/lib/php/extensions/curl.so
extension=${pkgs.php81Extensions.zip}/lib/php/extensions/zip.so
extension=${pkgs.php83Extensions.openssl}/lib/php/extensions/openssl.so
extension=${pkgs.php83Extensions.gd}/lib/php/extensions/gd.so
extension=${pkgs.php83Extensions.mysqlnd}/lib/php/extensions/mysqlnd.so
extension=${pkgs.php83Extensions.mbstring}/lib/php/extensions/mbstring.so
extension=${pkgs.php83Extensions.tokenizer}/lib/php/extensions/tokenizer.so
extension=${pkgs.php83Extensions.bcmath}/lib/php/extensions/bcmath.so
extension=${pkgs.php83Extensions.xml}/lib/php/extensions/xml.so
extension=${pkgs.php83Extensions.dom}/lib/php/extensions/dom.so
extension=${pkgs.php83Extensions.curl}/lib/php/extensions/curl.so
extension=${pkgs.php83Extensions.zip}/lib/php/extensions/zip.so
'';
pools.pterodactyl = {
user = config.services.nginx.user;
phpPackage = pkgs.php81;
phpPackage = pkgs.php83;
settings = {
"pm" = "dynamic";
"listen.owner" = config.services.nginx.user;

11
systems/x86_64-linux/earth/default.nix
View file

@ -12,6 +12,17 @@
trusted-users = ["zoey"];
};
nix.optimise = {
automatic = true;
dates = ["03:45"];
};
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 14d";
};
hardware.audio.enable = true;
hardware.nvidia.enable = true;

11
systems/x86_64-linux/pluto/default.nix
View file

@ -15,6 +15,17 @@
trusted-users = ["zoey"];
};
nix.optimise = {
automatic = true;
dates = ["03:45"];
};
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 14d";
};
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;