mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2024-11-21 22:23:09 +01:00
Removed extra packages - updated flake - added fixes for hyprland and removed broken bash language server.
This commit is contained in:
Tyler Kelley
parent
032897a15e
commit
7c768d5fe6
@ -21,7 +21,7 @@ Simple bug fixes.
|
|||||||
|
|
||||||
**ZaneyOS 2.2**
|
**ZaneyOS 2.2**
|
||||||
|
|
||||||
This release has a big theming change as well as including the move back to rofi. *Please note there is a known bug with Steam crashing Hyprland. After re-logging in though it shouldn't do it again. I will continue to hunt for a fix for this.*
|
This release has a big theming change as well as including the move back to rofi. It is a massive improvement in many ways.
|
||||||
|
|
||||||
- Revert the switch from rofi to wofi. Rofi is just better.
|
- Revert the switch from rofi to wofi. Rofi is just better.
|
||||||
- Switch from Nix Colors to Stylix. It can build colorschemes from a wallpaper.
|
- Switch from Nix Colors to Stylix. It can build colorschemes from a wallpaper.
|
||||||
@ -34,3 +34,5 @@ This release has a big theming change as well as including the move back to rofi
|
|||||||
- Added Plymouth for better looking booting.
|
- Added Plymouth for better looking booting.
|
||||||
- Improve the fonts being installed and properly separate them from regular packages.
|
- Improve the fonts being installed and properly separate them from regular packages.
|
||||||
- Separated Neovim configuration for readability.
|
- Separated Neovim configuration for readability.
|
||||||
|
- Updated flake and added fix for popups going to wrkspc 1 in Hyprland.
|
||||||
|
- Removed a few of the packages that aren't necessary and dissabled avahi and smartd by default.
|
||||||
|
|||||||
@ -50,7 +50,7 @@ with lib;
|
|||||||
exec-once = killall -q swaync;sleep .5 && swaync
|
exec-once = killall -q swaync;sleep .5 && swaync
|
||||||
exec-once = nm-applet --indicator
|
exec-once = nm-applet --indicator
|
||||||
exec-once = lxqt-policykit-agent
|
exec-once = lxqt-policykit-agent
|
||||||
exec-once = swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg
|
exec-once = sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg
|
||||||
monitor=,preferred,auto,1
|
monitor=,preferred,auto,1
|
||||||
${extraMonitorSettings}
|
${extraMonitorSettings}
|
||||||
general {
|
general {
|
||||||
@ -81,6 +81,7 @@ with lib;
|
|||||||
workspace_swipe_fingers = 3
|
workspace_swipe_fingers = 3
|
||||||
}
|
}
|
||||||
misc {
|
misc {
|
||||||
|
initial_workspace_tracking = 0
|
||||||
mouse_move_enables_dpms = true
|
mouse_move_enables_dpms = true
|
||||||
key_press_enables_dpms = false
|
key_press_enables_dpms = false
|
||||||
}
|
}
|
||||||
@ -125,9 +126,6 @@ with lib;
|
|||||||
pseudotile = true
|
pseudotile = true
|
||||||
preserve_split = true
|
preserve_split = true
|
||||||
}
|
}
|
||||||
master {
|
|
||||||
new_is_master = true
|
|
||||||
}
|
|
||||||
bind = ${modifier},Return,exec,${terminal}
|
bind = ${modifier},Return,exec,${terminal}
|
||||||
bind = ${modifier}SHIFT,Return,exec,rofi-launcher
|
bind = ${modifier}SHIFT,Return,exec,rofi-launcher
|
||||||
bind = ${modifier}SHIFT,W,exec,web-search
|
bind = ${modifier}SHIFT,W,exec,web-search
|
||||||
|
|||||||
@ -22,7 +22,7 @@ in
|
|||||||
luajitPackages.lua-lsp
|
luajitPackages.lua-lsp
|
||||||
nil
|
nil
|
||||||
rust-analyzer
|
rust-analyzer
|
||||||
nodePackages.bash-language-server
|
#nodePackages.bash-language-server
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
pyright
|
pyright
|
||||||
marksman
|
marksman
|
||||||
|
|||||||
107
flake.lock
107
flake.lock
@ -101,15 +101,15 @@
|
|||||||
"base16-vim": {
|
"base16-vim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1663659192,
|
"lastModified": 1716150083,
|
||||||
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
|
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
|
||||||
"owner": "chriskempson",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-vim",
|
"repo": "base16-vim",
|
||||||
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
|
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "chriskempson",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-vim",
|
"repo": "base16-vim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -186,11 +186,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716457508,
|
"lastModified": 1718526747,
|
||||||
"narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
|
"narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
|
"rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -237,11 +237,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716327911,
|
"lastModified": 1718368322,
|
||||||
"narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=",
|
"narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d",
|
"rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -254,17 +254,18 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprcursor": "hyprcursor",
|
"hyprcursor": "hyprcursor",
|
||||||
"hyprlang": "hyprlang",
|
"hyprlang": "hyprlang",
|
||||||
|
"hyprutils": "hyprutils",
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"systems": "systems",
|
"systems": "systems",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716480279,
|
"lastModified": 1718566457,
|
||||||
"narHash": "sha256-iZmMWUnWMY+bn+kGKdsXL4y1zs9hViSRwMii01j7Wok=",
|
"narHash": "sha256-FtgnoGecYVBnGelxdcgavpogPVn+zi/5p4JFJM+9VJk=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "255272ea18a1bd899168b2d2063b6f153edda919",
|
"rev": "b15be9c77de593581007de53b2bbca97d121900a",
|
||||||
"revCount": 4731,
|
"revCount": 4851,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
@ -280,6 +281,11 @@
|
|||||||
"hyprland": [
|
"hyprland": [
|
||||||
"hyprland"
|
"hyprland"
|
||||||
],
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprland-plugins",
|
||||||
|
"hyprland",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"systems": [
|
"systems": [
|
||||||
"hyprland-plugins",
|
"hyprland-plugins",
|
||||||
"hyprland",
|
"hyprland",
|
||||||
@ -287,11 +293,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715722806,
|
"lastModified": 1718479633,
|
||||||
"narHash": "sha256-KrSLG2H3KGELxTFdiBhv8U6D53Q3UsJsQO+KgEabsNA=",
|
"narHash": "sha256-Bw3JRBUZg2kmDwxa/UHvD//gGcNjbftTj2MSeLvx1q8=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-plugins",
|
"repo": "hyprland-plugins",
|
||||||
"rev": "c28d1011f4868c1a1ee80b10d9ee79900686df82",
|
"rev": "d92d9d6cd93b731143119cbcab54dcc7a0481131",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -329,6 +335,10 @@
|
|||||||
},
|
},
|
||||||
"hyprlang": {
|
"hyprlang": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"hyprutils": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprutils"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
@ -339,11 +349,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715791527,
|
"lastModified": 1717881852,
|
||||||
"narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=",
|
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee",
|
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -352,6 +362,31 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hyprutils": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprland",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprland",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1718271409,
|
||||||
|
"narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprutils",
|
||||||
|
"rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprutils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"hyprwayland-scanner": {
|
"hyprwayland-scanner": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@ -364,11 +399,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716058375,
|
"lastModified": 1718119275,
|
||||||
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
|
"narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwayland-scanner",
|
"repo": "hyprwayland-scanner",
|
||||||
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
|
"rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -379,11 +414,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716330097,
|
"lastModified": 1718318537,
|
||||||
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
|
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
|
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -395,11 +430,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716330097,
|
"lastModified": 1718318537,
|
||||||
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
|
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
|
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -450,11 +485,11 @@
|
|||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716456264,
|
"lastModified": 1718546905,
|
||||||
"narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=",
|
"narHash": "sha256-FmtNOW6Ng11TTgsXkQLqBcIE0j2SmlydHXu/DnWlS4k=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "290c8aef476ce98fff9cefc059284429d561a085",
|
"rev": "80e8e1e2f613bdc8749461899f0959312eb4a54e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -495,11 +530,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716290197,
|
"lastModified": 1718272114,
|
||||||
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
|
"narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
|
"rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@ -51,6 +51,7 @@
|
|||||||
|
|
||||||
# Styling Options
|
# Styling Options
|
||||||
stylix = {
|
stylix = {
|
||||||
|
enable = true;
|
||||||
image = ../../config/wallpapers/zaney-wallpaper.jpg;
|
image = ../../config/wallpapers/zaney-wallpaper.jpg;
|
||||||
# base16Scheme = {
|
# base16Scheme = {
|
||||||
# base00 = "232136";
|
# base00 = "232136";
|
||||||
@ -243,12 +244,10 @@
|
|||||||
htop
|
htop
|
||||||
libvirt
|
libvirt
|
||||||
lxqt.lxqt-policykit
|
lxqt.lxqt-policykit
|
||||||
mangohud
|
|
||||||
lm_sensors
|
lm_sensors
|
||||||
unzip
|
unzip
|
||||||
unrar
|
unrar
|
||||||
libnotify
|
libnotify
|
||||||
eza
|
|
||||||
v4l-utils
|
v4l-utils
|
||||||
ydotool
|
ydotool
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
@ -262,7 +261,6 @@
|
|||||||
pkg-config
|
pkg-config
|
||||||
meson
|
meson
|
||||||
hyprpicker
|
hyprpicker
|
||||||
gnumake
|
|
||||||
ninja
|
ninja
|
||||||
brightnessctl
|
brightnessctl
|
||||||
virt-viewer
|
virt-viewer
|
||||||
@ -281,15 +279,10 @@
|
|||||||
gnome.file-roller
|
gnome.file-roller
|
||||||
swaynotificationcenter
|
swaynotificationcenter
|
||||||
imv
|
imv
|
||||||
transmission-gtk
|
|
||||||
distrobox
|
|
||||||
mpv
|
mpv
|
||||||
gimp
|
gimp
|
||||||
rustup
|
|
||||||
audacity
|
|
||||||
pavucontrol
|
pavucontrol
|
||||||
tree
|
tree
|
||||||
protonup-qt
|
|
||||||
spotify
|
spotify
|
||||||
neovide
|
neovide
|
||||||
greetd.tuigreet
|
greetd.tuigreet
|
||||||
@ -353,17 +346,19 @@
|
|||||||
autodetect = true;
|
autodetect = true;
|
||||||
};
|
};
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
fstrim.enable = false;
|
fstrim.enable = true;
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
openssh.enable = true;
|
openssh.enable = true;
|
||||||
flatpak.enable = false;
|
flatpak.enable = false;
|
||||||
printing = {
|
printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# drivers = [ pkgs.hplipWithPlugin ];
|
drivers = [
|
||||||
|
# pkgs.hplipWithPlugin
|
||||||
|
];
|
||||||
};
|
};
|
||||||
gnome.gnome-keyring.enable = true;
|
gnome.gnome-keyring.enable = true;
|
||||||
avahi = {
|
avahi = {
|
||||||
enable = true;
|
enable = false;
|
||||||
nssmdns4 = true;
|
nssmdns4 = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,47 +1,28 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
username,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
|
||||||
"xhci_pci"
|
|
||||||
"ehci_pci"
|
|
||||||
"ahci"
|
|
||||||
"nvme"
|
|
||||||
"usbhid"
|
|
||||||
"sd_mod"
|
|
||||||
];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" =
|
||||||
device = "/dev/disk/by-uuid/9e36b8f0-e272-4e69-99ad-dba17949887f";
|
{ device = "/dev/disk/by-uuid/c537152e-ea4f-4bb7-b453-088612e0024a";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home/${username}/Documents" = {
|
fileSystems."/boot" =
|
||||||
device = "/dev/disk/by-uuid/5605f7ab-73df-4234-a8ed-50c1eae69ffa";
|
{ device = "/dev/disk/by-uuid/DA7B-269C";
|
||||||
fsType = "ext4";
|
fsType = "vfat";
|
||||||
};
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/7CBF-413D";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [
|
|
||||||
"fmask=0022"
|
|
||||||
"dmask=0022"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
@ -51,7 +32,6 @@
|
|||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.wlp0s20u10.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|||||||
@ -114,7 +114,7 @@ in
|
|||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
style.name = "adwaita-dark";
|
style.name = "adwaita-dark";
|
||||||
platformTheme = "gtk3";
|
platformTheme.name = "gtk3";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
# Git Configuration ( For Pulling Software Repos )
|
# Git Configuration ( For Pulling Software Repos )
|
||||||
gitUsername = "John Smith";
|
gitUsername = "Tyler Kelley";
|
||||||
gitEmail = "example@gmail.com";
|
gitEmail = "tylerzanekelley@gmail.com";
|
||||||
|
|
||||||
# Hyprland Settings
|
# Hyprland Settings
|
||||||
borderAnim = true; # Enable / Disable Hyprland Border Animation
|
borderAnim = true; # Enable / Disable Hyprland Border Animation
|
||||||
|
|||||||
@ -1,482 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
host,
|
|
||||||
username,
|
|
||||||
options,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./hardware.nix
|
|
||||||
./users.nix
|
|
||||||
../../modules/amd-drivers.nix
|
|
||||||
../../modules/nvidia-drivers.nix
|
|
||||||
../../modules/nvidia-prime-drivers.nix
|
|
||||||
../../modules/intel-drivers.nix
|
|
||||||
../../modules/vm-guest-services.nix
|
|
||||||
../../modules/local-hardware-clock.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
boot = {
|
|
||||||
# Kernel
|
|
||||||
kernelPackages = pkgs.linuxPackages_zen;
|
|
||||||
# This is for OBS Virtual Cam Support
|
|
||||||
kernelModules = [ "v4l2loopback" ];
|
|
||||||
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
|
|
||||||
# Needed For Some Steam Games
|
|
||||||
kernel.sysctl = {
|
|
||||||
"vm.max_map_count" = 2147483642;
|
|
||||||
};
|
|
||||||
# Bootloader.
|
|
||||||
loader.systemd-boot.enable = true;
|
|
||||||
loader.efi.canTouchEfiVariables = true;
|
|
||||||
# Make /tmp a tmpfs
|
|
||||||
tmp = {
|
|
||||||
useTmpfs = false;
|
|
||||||
tmpfsSize = "30%";
|
|
||||||
};
|
|
||||||
# Appimage Support
|
|
||||||
binfmt.registrations.appimage = {
|
|
||||||
wrapInterpreterInShell = false;
|
|
||||||
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
|
|
||||||
recognitionType = "magic";
|
|
||||||
offset = 0;
|
|
||||||
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
|
|
||||||
magicOrExtension = ''\x7fELF....AI\x02'';
|
|
||||||
};
|
|
||||||
plymouth.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Styling Options
|
|
||||||
stylix = {
|
|
||||||
image = ../../config/wallpapers/zaney-wallpaper.jpg;
|
|
||||||
# base16Scheme = {
|
|
||||||
# base00 = "232136";
|
|
||||||
# base01 = "2a273f";
|
|
||||||
# base02 = "393552";
|
|
||||||
# base03 = "6e6a86";
|
|
||||||
# base04 = "908caa";
|
|
||||||
# base05 = "e0def4";
|
|
||||||
# base06 = "e0def4";
|
|
||||||
# base07 = "56526e";
|
|
||||||
# base08 = "eb6f92";
|
|
||||||
# base09 = "f6c177";
|
|
||||||
# base0A = "ea9a97";
|
|
||||||
# base0B = "3e8fb0";
|
|
||||||
# base0C = "9ccfd8";
|
|
||||||
# base0D = "c4a7e7";
|
|
||||||
# base0E = "f6c177";
|
|
||||||
# base0F = "56526e";
|
|
||||||
# };
|
|
||||||
polarity = "dark";
|
|
||||||
cursor.package = pkgs.bibata-cursors;
|
|
||||||
cursor.name = "Bibata-Modern-Ice";
|
|
||||||
cursor.size = 24;
|
|
||||||
fonts = {
|
|
||||||
monospace = {
|
|
||||||
package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
|
|
||||||
name = "JetBrainsMono Nerd Font Mono";
|
|
||||||
};
|
|
||||||
sansSerif = {
|
|
||||||
package = pkgs.montserrat;
|
|
||||||
name = "Montserrat";
|
|
||||||
};
|
|
||||||
serif = {
|
|
||||||
package = pkgs.montserrat;
|
|
||||||
name = "Montserrat";
|
|
||||||
};
|
|
||||||
sizes = {
|
|
||||||
applications = 12;
|
|
||||||
terminal = 15;
|
|
||||||
desktop = 11;
|
|
||||||
popups = 12;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Extra Module Options
|
|
||||||
drivers.amdgpu.enable = true;
|
|
||||||
drivers.nvidia.enable = false;
|
|
||||||
drivers.nvidia-prime = {
|
|
||||||
enable = false;
|
|
||||||
intelBusID = "";
|
|
||||||
nvidiaBusID = "";
|
|
||||||
};
|
|
||||||
drivers.intel.enable = false;
|
|
||||||
vm.guest-services.enable = false;
|
|
||||||
local.hardware-clock.enable = false;
|
|
||||||
|
|
||||||
# Enable networking
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
networking.hostName = host;
|
|
||||||
networking.timeServers = options.networking.timeServers.default ++ [ "pool.ntp.org" ];
|
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "America/Chicago";
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
|
||||||
|
|
||||||
i18n.extraLocaleSettings = {
|
|
||||||
LC_ADDRESS = "en_US.UTF-8";
|
|
||||||
LC_IDENTIFICATION = "en_US.UTF-8";
|
|
||||||
LC_MEASUREMENT = "en_US.UTF-8";
|
|
||||||
LC_MONETARY = "en_US.UTF-8";
|
|
||||||
LC_NAME = "en_US.UTF-8";
|
|
||||||
LC_NUMERIC = "en_US.UTF-8";
|
|
||||||
LC_PAPER = "en_US.UTF-8";
|
|
||||||
LC_TELEPHONE = "en_US.UTF-8";
|
|
||||||
LC_TIME = "en_US.UTF-8";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
|
||||||
firefox.enable = true;
|
|
||||||
starship = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
add_newline = false;
|
|
||||||
buf = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
c = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
directory = {
|
|
||||||
read_only = " ";
|
|
||||||
};
|
|
||||||
docker_context = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
fossil_branch = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
git_branch = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
golang = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
hg_branch = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
hostname = {
|
|
||||||
ssh_symbol = " ";
|
|
||||||
};
|
|
||||||
lua = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
memory_usage = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
meson = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
nim = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
nix_shell = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
nodejs = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
ocaml = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
package = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
python = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
rust = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
swift = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
zig = {
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
dconf.enable = true;
|
|
||||||
seahorse.enable = true;
|
|
||||||
fuse.userAllowOther = true;
|
|
||||||
mtr.enable = true;
|
|
||||||
gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
virt-manager.enable = true;
|
|
||||||
steam = {
|
|
||||||
enable = true;
|
|
||||||
gamescopeSession.enable = true;
|
|
||||||
remotePlay.openFirewall = true;
|
|
||||||
dedicatedServer.openFirewall = true;
|
|
||||||
};
|
|
||||||
thunar = {
|
|
||||||
enable = true;
|
|
||||||
plugins = with pkgs.xfce; [
|
|
||||||
thunar-archive-plugin
|
|
||||||
thunar-volman
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
users = {
|
|
||||||
mutableUsers = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
vim
|
|
||||||
wget
|
|
||||||
killall
|
|
||||||
git
|
|
||||||
cmatrix
|
|
||||||
lolcat
|
|
||||||
neofetch
|
|
||||||
htop
|
|
||||||
libvirt
|
|
||||||
lxqt.lxqt-policykit
|
|
||||||
mangohud
|
|
||||||
lm_sensors
|
|
||||||
unzip
|
|
||||||
unrar
|
|
||||||
libnotify
|
|
||||||
eza
|
|
||||||
v4l-utils
|
|
||||||
ydotool
|
|
||||||
wl-clipboard
|
|
||||||
pciutils
|
|
||||||
ffmpeg
|
|
||||||
socat
|
|
||||||
cowsay
|
|
||||||
ripgrep
|
|
||||||
lsd
|
|
||||||
lshw
|
|
||||||
pkg-config
|
|
||||||
meson
|
|
||||||
hyprpicker
|
|
||||||
gnumake
|
|
||||||
ninja
|
|
||||||
brightnessctl
|
|
||||||
virt-viewer
|
|
||||||
swappy
|
|
||||||
appimage-run
|
|
||||||
networkmanagerapplet
|
|
||||||
yad
|
|
||||||
playerctl
|
|
||||||
nh
|
|
||||||
nixfmt-rfc-style
|
|
||||||
discord
|
|
||||||
libvirt
|
|
||||||
swww
|
|
||||||
grim
|
|
||||||
slurp
|
|
||||||
gnome.file-roller
|
|
||||||
swaynotificationcenter
|
|
||||||
imv
|
|
||||||
transmission-gtk
|
|
||||||
distrobox
|
|
||||||
mpv
|
|
||||||
gimp
|
|
||||||
rustup
|
|
||||||
audacity
|
|
||||||
pavucontrol
|
|
||||||
tree
|
|
||||||
protonup-qt
|
|
||||||
spotify
|
|
||||||
neovide
|
|
||||||
greetd.tuigreet
|
|
||||||
];
|
|
||||||
|
|
||||||
fonts = {
|
|
||||||
packages = with pkgs; [
|
|
||||||
noto-fonts-emoji
|
|
||||||
noto-fonts-cjk
|
|
||||||
font-awesome
|
|
||||||
symbola
|
|
||||||
material-icons
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.variables = {
|
|
||||||
ZANEYOS_VERSION = "2.2";
|
|
||||||
ZANEYOS = "true";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Extra Portal Configuration
|
|
||||||
xdg.portal = {
|
|
||||||
enable = true;
|
|
||||||
wlr.enable = true;
|
|
||||||
extraPortals = [
|
|
||||||
pkgs.xdg-desktop-portal-gtk
|
|
||||||
pkgs.xdg-desktop-portal
|
|
||||||
];
|
|
||||||
configPackages = [
|
|
||||||
pkgs.xdg-desktop-portal-gtk
|
|
||||||
pkgs.xdg-desktop-portal-hyprland
|
|
||||||
pkgs.xdg-desktop-portal
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Services to start
|
|
||||||
services = {
|
|
||||||
xserver = {
|
|
||||||
enable = false;
|
|
||||||
xkb = {
|
|
||||||
layout = "us";
|
|
||||||
variant = "";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
greetd = {
|
|
||||||
enable = true;
|
|
||||||
vt = 3;
|
|
||||||
settings = {
|
|
||||||
default_session = {
|
|
||||||
# Wayland Desktop Manager is installed only for user ryan via home-manager!
|
|
||||||
user = username;
|
|
||||||
# .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others).
|
|
||||||
# with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here.
|
|
||||||
# command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager
|
|
||||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
smartd = {
|
|
||||||
enable = true;
|
|
||||||
autodetect = true;
|
|
||||||
};
|
|
||||||
libinput.enable = true;
|
|
||||||
fstrim.enable = true;
|
|
||||||
gvfs.enable = true;
|
|
||||||
openssh.enable = true;
|
|
||||||
flatpak.enable = false;
|
|
||||||
printing = {
|
|
||||||
enable = true;
|
|
||||||
drivers = [ pkgs.hplipWithPlugin ];
|
|
||||||
};
|
|
||||||
gnome.gnome-keyring.enable = true;
|
|
||||||
avahi = {
|
|
||||||
enable = true;
|
|
||||||
nssmdns4 = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
ipp-usb.enable = true;
|
|
||||||
syncthing = {
|
|
||||||
enable = false;
|
|
||||||
user = "${username}";
|
|
||||||
dataDir = "/home/${username}";
|
|
||||||
configDir = "/home/${username}/.config/syncthing";
|
|
||||||
};
|
|
||||||
pipewire = {
|
|
||||||
enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
};
|
|
||||||
rpcbind.enable = true;
|
|
||||||
nfs.server.enable = true;
|
|
||||||
};
|
|
||||||
systemd.services.flatpak-repo = {
|
|
||||||
path = [ pkgs.flatpak ];
|
|
||||||
script = ''
|
|
||||||
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
hardware.sane = {
|
|
||||||
enable = true;
|
|
||||||
extraBackends = [ pkgs.sane-airscan ];
|
|
||||||
disabledDefaultBackends = [ "escl" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Extra Logitech Support
|
|
||||||
hardware.logitech.wireless.enable = true;
|
|
||||||
hardware.logitech.wireless.enableGraphical = true;
|
|
||||||
|
|
||||||
# Bluetooth Support
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
hardware.bluetooth.powerOnBoot = true;
|
|
||||||
services.blueman.enable = true;
|
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
|
||||||
sound.enable = true;
|
|
||||||
hardware.pulseaudio.enable = false;
|
|
||||||
|
|
||||||
# Security / Polkit
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
security.polkit.enable = true;
|
|
||||||
security.polkit.extraConfig = ''
|
|
||||||
polkit.addRule(function(action, subject) {
|
|
||||||
if (
|
|
||||||
subject.isInGroup("users")
|
|
||||||
&& (
|
|
||||||
action.id == "org.freedesktop.login1.reboot" ||
|
|
||||||
action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
|
|
||||||
action.id == "org.freedesktop.login1.power-off" ||
|
|
||||||
action.id == "org.freedesktop.login1.power-off-multiple-sessions"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return polkit.Result.YES;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
'';
|
|
||||||
security.pam.services.swaylock = {
|
|
||||||
text = ''
|
|
||||||
auth include login
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# Optimization settings and garbage collection automation
|
|
||||||
nix = {
|
|
||||||
settings = {
|
|
||||||
auto-optimise-store = true;
|
|
||||||
experimental-features = [
|
|
||||||
"nix-command"
|
|
||||||
"flakes"
|
|
||||||
];
|
|
||||||
substituters = [ "https://hyprland.cachix.org" ];
|
|
||||||
trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
|
|
||||||
};
|
|
||||||
gc = {
|
|
||||||
automatic = true;
|
|
||||||
dates = "weekly";
|
|
||||||
options = "--delete-older-than 7d";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Virtualization / Containers
|
|
||||||
virtualisation.libvirtd.enable = true;
|
|
||||||
virtualisation.podman = {
|
|
||||||
enable = true;
|
|
||||||
dockerCompat = true;
|
|
||||||
defaultNetwork.settings.dns_enabled = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# OpenGL
|
|
||||||
hardware.opengl = {
|
|
||||||
enable = true;
|
|
||||||
driSupport = true;
|
|
||||||
driSupport32Bit = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
# networking.firewall.enable = false;
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
|
||||||
# settings for stateful data, like file locations and database versions
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
|
||||||
system.stateVersion = "23.11"; # Did you read the comment?
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
username,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [
|
|
||||||
"xhci_pci"
|
|
||||||
"ehci_pci"
|
|
||||||
"ahci"
|
|
||||||
"nvme"
|
|
||||||
"usbhid"
|
|
||||||
"sd_mod"
|
|
||||||
];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" = {
|
|
||||||
device = "/dev/disk/by-uuid/9e36b8f0-e272-4e69-99ad-dba17949887f";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/home/${username}/Documents" = {
|
|
||||||
device = "/dev/disk/by-uuid/5605f7ab-73df-4234-a8ed-50c1eae69ffa";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/7CBF-413D";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [
|
|
||||||
"fmask=0022"
|
|
||||||
"dmask=0022"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp0s20u10.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
@ -1,261 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
username,
|
|
||||||
host,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (import ./variables.nix) gitUsername gitEmail;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
# Home Manager Settings
|
|
||||||
home.username = "${username}";
|
|
||||||
home.homeDirectory = "/home/${username}";
|
|
||||||
home.stateVersion = "23.11";
|
|
||||||
|
|
||||||
# Import Program Configurations
|
|
||||||
imports = [
|
|
||||||
inputs.hyprland.homeManagerModules.default
|
|
||||||
../../config/emoji.nix
|
|
||||||
../../config/hyprland.nix
|
|
||||||
../../config/neovim.nix
|
|
||||||
../../config/rofi/rofi.nix
|
|
||||||
../../config/rofi/config-emoji.nix
|
|
||||||
../../config/rofi/config-long.nix
|
|
||||||
../../config/swaync.nix
|
|
||||||
../../config/waybar.nix
|
|
||||||
../../config/wlogout.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
# Place Files Inside Home Directory
|
|
||||||
home.file."Pictures/Wallpapers" = {
|
|
||||||
source = ../../config/wallpapers;
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
home.file.".config/wlogout/icons" = {
|
|
||||||
source = ../../config/wlogout;
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
home.file.".config/ascii-neofetch".source = ../../config/ascii-neofetch;
|
|
||||||
home.file.".face.icon".source = ../../config/face.jpg;
|
|
||||||
home.file.".config/face.jpg".source = ../../config/face.jpg;
|
|
||||||
home.file.".config/neofetch/config.conf".text = ''
|
|
||||||
print_info() {
|
|
||||||
prin "$(color 6) ZaneyOS $ZANEYOS_VERSION"
|
|
||||||
info underline
|
|
||||||
info "$(color 7) VER" kernel
|
|
||||||
info "$(color 2) UP " uptime
|
|
||||||
info "$(color 4) PKG" packages
|
|
||||||
info "$(color 6) DE " de
|
|
||||||
info "$(color 5) TER" term
|
|
||||||
info "$(color 3) CPU" cpu
|
|
||||||
info "$(color 7) GPU" gpu
|
|
||||||
info "$(color 5) MEM" memory
|
|
||||||
prin " "
|
|
||||||
prin "$(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)"
|
|
||||||
}
|
|
||||||
distro_shorthand="on"
|
|
||||||
memory_unit="gib"
|
|
||||||
cpu_temp="C"
|
|
||||||
separator=" $(color 4)>"
|
|
||||||
stdout="off"
|
|
||||||
'';
|
|
||||||
home.file.".config/swappy/config".text = ''
|
|
||||||
[Default]
|
|
||||||
save_dir=/home/${username}/Pictures/Screenshots
|
|
||||||
save_filename_format=swappy-%Y%m%d-%H%M%S.png
|
|
||||||
show_panel=false
|
|
||||||
line_size=5
|
|
||||||
text_size=20
|
|
||||||
text_font=Ubuntu
|
|
||||||
paint_mode=brush
|
|
||||||
early_exit=true
|
|
||||||
fill_shape=false
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Install & Configure Git
|
|
||||||
programs.git = {
|
|
||||||
enable = true;
|
|
||||||
userName = "${gitUsername}";
|
|
||||||
userEmail = "${gitEmail}";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Create XDG Dirs
|
|
||||||
xdg = {
|
|
||||||
userDirs = {
|
|
||||||
enable = true;
|
|
||||||
createDirectories = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
dconf.settings = {
|
|
||||||
"org/virt-manager/virt-manager/connections" = {
|
|
||||||
autoconnect = [ "qemu:///system" ];
|
|
||||||
uris = [ "qemu:///system" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Styling Options
|
|
||||||
stylix.targets.waybar.enable = false;
|
|
||||||
stylix.targets.rofi.enable = false;
|
|
||||||
gtk = {
|
|
||||||
iconTheme = {
|
|
||||||
name = "Papirus-Dark";
|
|
||||||
package = pkgs.papirus-icon-theme;
|
|
||||||
};
|
|
||||||
gtk3.extraConfig = {
|
|
||||||
gtk-application-prefer-dark-theme = 1;
|
|
||||||
};
|
|
||||||
gtk4.extraConfig = {
|
|
||||||
gtk-application-prefer-dark-theme = 1;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
qt = {
|
|
||||||
enable = true;
|
|
||||||
style.name = "adwaita-dark";
|
|
||||||
platformTheme = "gtk3";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
# Scripts
|
|
||||||
home.packages = [
|
|
||||||
(import ../../scripts/emopicker9000.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/task-waybar.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/squirtle.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/nvidia-offload.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/wallsetter.nix {
|
|
||||||
inherit pkgs;
|
|
||||||
inherit username;
|
|
||||||
})
|
|
||||||
(import ../../scripts/web-search.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/rofi-launcher.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/screenshootin.nix { inherit pkgs; })
|
|
||||||
(import ../../scripts/list-hypr-bindings.nix {
|
|
||||||
inherit pkgs;
|
|
||||||
inherit host;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services = {
|
|
||||||
hypridle = {
|
|
||||||
settings = {
|
|
||||||
general = {
|
|
||||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
|
||||||
ignore_dbus_inhibit = false;
|
|
||||||
lock_cmd = "hyprlock";
|
|
||||||
starship = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.starship;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
listener = [
|
|
||||||
{
|
|
||||||
timeout = 900;
|
|
||||||
on-timeout = "hyprlock";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
timeout = 1200;
|
|
||||||
on-timeout = "hyprctl dispatch dpms off";
|
|
||||||
on-resume = "hyprctl dispatch dpms on";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
|
||||||
gh.enable = true;
|
|
||||||
kitty = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.kitty;
|
|
||||||
settings = {
|
|
||||||
scrollback_lines = 2000;
|
|
||||||
wheel_scroll_min_lines = 1;
|
|
||||||
window_padding_width = 4;
|
|
||||||
confirm_os_window_close = 0;
|
|
||||||
};
|
|
||||||
extraConfig = ''
|
|
||||||
tab_bar_style fade
|
|
||||||
tab_fade 1
|
|
||||||
active_tab_font_style bold
|
|
||||||
inactive_tab_font_style bold
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
bash = {
|
|
||||||
enable = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
profileExtra = ''
|
|
||||||
#if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
|
||||||
# exec Hyprland
|
|
||||||
#fi
|
|
||||||
'';
|
|
||||||
initExtra = ''
|
|
||||||
neofetch
|
|
||||||
if [ -f $HOME/.bashrc-personal ]; then
|
|
||||||
source $HOME/.bashrc-personal
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
shellAliases = {
|
|
||||||
sv = "sudo nvim";
|
|
||||||
fr = "nh os switch --hostname ${host} /home/${username}/zaneyos";
|
|
||||||
fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos";
|
|
||||||
zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)";
|
|
||||||
ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
|
|
||||||
v = "nvim";
|
|
||||||
ls = "lsd";
|
|
||||||
ll = "lsd -l";
|
|
||||||
la = "lsd -a";
|
|
||||||
lal = "lsd -al";
|
|
||||||
".." = "cd ..";
|
|
||||||
neofetch = "neofetch --ascii ~/.config/ascii-neofetch";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
home-manager.enable = true;
|
|
||||||
hyprlock = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
general = {
|
|
||||||
disable_loading_bar = true;
|
|
||||||
grace = 10;
|
|
||||||
hide_cursor = true;
|
|
||||||
no_fade_in = false;
|
|
||||||
};
|
|
||||||
background = [
|
|
||||||
{
|
|
||||||
path = "/home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg";
|
|
||||||
blur_passes = 3;
|
|
||||||
blur_size = 8;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
image = [
|
|
||||||
{
|
|
||||||
path = "/home/${username}/.config/face.jpg";
|
|
||||||
size = 150;
|
|
||||||
border_size = 4;
|
|
||||||
border_color = "rgb(0C96F9)";
|
|
||||||
rounding = -1; # Negative means circle
|
|
||||||
position = "0, 200";
|
|
||||||
halign = "center";
|
|
||||||
valign = "center";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
input-field = [
|
|
||||||
{
|
|
||||||
size = "200, 50";
|
|
||||||
position = "0, -80";
|
|
||||||
monitor = "";
|
|
||||||
dots_center = true;
|
|
||||||
fade_on_empty = false;
|
|
||||||
font_color = "rgb(CFE6F4)";
|
|
||||||
inner_color = "rgb(657DC2)";
|
|
||||||
outer_color = "rgb(0D0E15)";
|
|
||||||
outline_thickness = 5;
|
|
||||||
placeholder_text = "Password...";
|
|
||||||
shadow_passes = 2;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
username,
|
|
||||||
host,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (import ./variables.nix) gitUsername;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
users.users = {
|
|
||||||
"${username}" = {
|
|
||||||
homeMode = "755";
|
|
||||||
isNormalUser = true;
|
|
||||||
description = "${gitUsername}";
|
|
||||||
extraGroups = [
|
|
||||||
"networkmanager"
|
|
||||||
"wheel"
|
|
||||||
"libvirtd"
|
|
||||||
"scanner"
|
|
||||||
"lp"
|
|
||||||
];
|
|
||||||
shell = pkgs.bash;
|
|
||||||
ignoreShellProgramCheck = true;
|
|
||||||
packages = with pkgs; [
|
|
||||||
obs-studio
|
|
||||||
zeroad
|
|
||||||
blender-hip
|
|
||||||
];
|
|
||||||
};
|
|
||||||
# "newuser" = {
|
|
||||||
# homeMode = "755";
|
|
||||||
# isNormalUser = true;
|
|
||||||
# description = "New user account";
|
|
||||||
# extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
|
|
||||||
# shell = pkgs.bash;
|
|
||||||
# ignoreShellProgramCheck = true;
|
|
||||||
# packages = with pkgs; [];
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
# Git Configuration ( For Pulling Software Repos )
|
|
||||||
gitUsername = "Tyler Kelley";
|
|
||||||
gitEmail = "tylerzanekelley@gmail.com";
|
|
||||||
|
|
||||||
# Hyprland Settings
|
|
||||||
borderAnim = true; # Enable / Disable Hyprland Border Animation
|
|
||||||
extraMonitorSettings = "";
|
|
||||||
|
|
||||||
# Waybar Settings
|
|
||||||
clock24h = false;
|
|
||||||
|
|
||||||
# Program Options
|
|
||||||
browser = "firefox"; # Set Default Browser (google-chrome-stable for google-chrome)
|
|
||||||
terminal = "kitty"; # Set Default System Terminal
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user