Merge branch 'master' of github.com:pagedMov/nixos-config
This commit is contained in:
@@ -35,6 +35,11 @@ Currently there are two complete system configurations available. These are:
|
||||
* **Mercury** - My laptop configuration. My laptop is a pretty weak machine so this configuration is stripped down a bit.
|
||||
The 'Xenon' config is my server configuration and is highly unlikely to be of use to anyone but me, as the setup has some very specific use-cases.
|
||||
|
||||
## Modules
|
||||
|
||||
This config uses custom modules for the home-manager and system configurations. Basically every part of the configuration can be toggled using an option, and some configs have extra options as well.
|
||||
All of the options declared in these modules can be found in the documentation under docs/options
|
||||
|
||||
## Scripts
|
||||
|
||||
```chpaper``` - opens a fzf window with filenames and previews of images in $FLAKEPATH/assets/wallpapers. Picking one replaces the existing wallpaper path in $FLAKEPATH/flake.nix with the one you chose.
|
||||
|
||||
BIN
assets/sound/gitcheckout.wav
Normal file
BIN
assets/sound/gitcheckout.wav
Normal file
Binary file not shown.
230
docs/options/home_options.md
Normal file
230
docs/options/home_options.md
Normal file
@@ -0,0 +1,230 @@
|
||||
# Home-Manager Options
|
||||
|
||||
## homeFiles.enable
|
||||
- Enables my declared files
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/files/neofetch.nix'
|
||||
|
||||
## hyprlandConfig.enable
|
||||
- Enables my custom hyprland configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/hyprland.nix'
|
||||
|
||||
## autojumpConfig.enable
|
||||
- Enables my autojump options
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/autojump.nix'
|
||||
|
||||
## stylixHomeConfig.enable
|
||||
- Enables my stylix home-manager options
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/stylix.nix'
|
||||
|
||||
## waybarConfig.enable
|
||||
- Enables my custom waybar configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/waybar.nix'
|
||||
|
||||
## gtkConfig.enable
|
||||
- Enables my gtk configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/gtk.nix'
|
||||
|
||||
## spicetifyConfig.enable
|
||||
- Enables my spicetify configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/spicetify.nix'
|
||||
|
||||
## starshipConfig.enable
|
||||
- Enables my starship configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/starship.nix'
|
||||
|
||||
## btopConfig.enable
|
||||
- Enables my btop configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/btop.nix'
|
||||
|
||||
## swayncConfig.enable
|
||||
- Enables my swaync configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/swaync.nix'
|
||||
|
||||
## userPkgs.enable
|
||||
- Enables my default user packages
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/userpkgs.nix'
|
||||
|
||||
## cavaConfig.enable
|
||||
- Enables my cava configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/cava.nix'
|
||||
|
||||
## ezaConfig.enable
|
||||
- Enables my eza configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/eza.nix'
|
||||
|
||||
## firefoxConfig.enable
|
||||
- Enables my firefox configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/firefox.nix'
|
||||
|
||||
## fuzzelConfig.enable
|
||||
- Enables my fuzzel configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/fuzzel.nix'
|
||||
|
||||
## fzfConfig.enable
|
||||
- Enables my fzf configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/fzf.nix'
|
||||
|
||||
## gitConfig.enable
|
||||
- Enables my git configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/git.nix'
|
||||
|
||||
## kittyConfig.enable
|
||||
- Enables my kitty configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/kitty.nix'
|
||||
|
||||
## yaziConfig.enable
|
||||
- Enables my yazi configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/yazi.nix'
|
||||
|
||||
## zshConfig.enable
|
||||
- Enables my zsh configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/environment/zshell.nix'
|
||||
|
||||
## passConfig.enable
|
||||
- Enables my password-store configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/password-store.nix'
|
||||
|
||||
## batConfig.enable
|
||||
- Enables my bat configuration
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/programs/bat.nix'
|
||||
|
||||
## movScripts.enable
|
||||
- Enables my custom script binaries
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
|
||||
## movScripts.commandScripts
|
||||
### enable
|
||||
- Enables my custom command scripts
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### invoke.enable
|
||||
- Enables the invoke command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### runbg.enable
|
||||
- Enables the runbg command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### splash.enable
|
||||
- Enables the splash command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### toolbelt.enable
|
||||
- Enables the toolbelt command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### viconf.enable
|
||||
- Enables the viconf command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
|
||||
## movScripts.hyprlandControls
|
||||
### enable
|
||||
- Enables my hyprland control shortcut scripts
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### chpaper.enable
|
||||
- Enables the chpaper command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### scheck.enable
|
||||
- Enables the scheck command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### chscheme.enable
|
||||
- Enables the chscheme command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### keyring.enable
|
||||
- Enables the keyring command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### moveonscreen.enable
|
||||
- Enables the moveonscreen command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### switchmon.enable
|
||||
- Enables the switchmon command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
|
||||
## movScripts.nixShortcuts
|
||||
### enable
|
||||
- Enables my NixOS aliases
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### garbage-collect.enable
|
||||
- Enables the garbage-collect command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### nsp.enable
|
||||
- Enables the nsp command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
### rebuild.enable
|
||||
- Enables the rebuild command
|
||||
- Type: Boolean
|
||||
- Default: true
|
||||
- Defined in 'modules/home/scripts/default.nix'
|
||||
79
docs/options/system_options.md
Normal file
79
docs/options/system_options.md
Normal file
@@ -0,0 +1,79 @@
|
||||
# System Options
|
||||
|
||||
## networkModule.enable
|
||||
- Enables my network configuration
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/hardware/network.nix'
|
||||
|
||||
## nixSettings.enable
|
||||
- Enables my NixOS settings
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/environment/nix.nix'
|
||||
|
||||
## bootLoader.enable
|
||||
- Enables my bootloader settings
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/hardware/bootloader.nix'
|
||||
|
||||
## issue.enable
|
||||
- Enables my custom /etc/issue tty splash screen
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/environment/issue.nix'
|
||||
|
||||
## sddmConfig.enable
|
||||
- Enables my catppuccin-sddm configuration
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/environment/sddm.nix'
|
||||
|
||||
## stylixConfig.enable
|
||||
- Enables stylix for system theming
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/environment/stylix.nix'
|
||||
|
||||
## gamingPkgs.enable
|
||||
- Enables gaming-related packages
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/software/gaming/gaming_pkgs.nix'
|
||||
|
||||
## steamConfig.enable
|
||||
- Enables my Steam configuration
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/software/gaming/steam.nix'
|
||||
|
||||
## sysPkgs.enable
|
||||
- Installs my default system packages
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/software/packages.nix'
|
||||
|
||||
## sysProgs.enable
|
||||
- Enables
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/software/programs.nix'
|
||||
|
||||
## sysServices.enable
|
||||
- Description
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/software/services.nix'
|
||||
|
||||
## virtConfig.enable
|
||||
- Description
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/software/virtualization.nix'
|
||||
|
||||
## powerProfiles.enable
|
||||
- Description
|
||||
- Type: Boolean
|
||||
- Default: false
|
||||
- Defined in 'modules/sys/hardware/powerprofiles.nix'
|
||||
32
flake.lock
generated
32
flake.lock
generated
@@ -356,11 +356,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730016908,
|
||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
||||
"lastModified": 1730490306,
|
||||
"narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
||||
"rev": "1743615b61c7285976f85b303a36cdf88a556503",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -472,11 +472,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730373668,
|
||||
"narHash": "sha256-8p5JTUGFuhnyuF9lD98ioeE3zYaCmsizLWk4Y3KszAI=",
|
||||
"lastModified": 1730499652,
|
||||
"narHash": "sha256-De3YRKpowtm15xN7hK0PdBpu96wwSyQE+qFoq9Gi6lM=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "93b4478e70af6ffb08a4a66a6d0364c3296db296",
|
||||
"revCount": 5396,
|
||||
"rev": "32b18179dd789cde948c97eb3c2ebbdd6af36bf7",
|
||||
"revCount": 5402,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
@@ -822,11 +822,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730368298,
|
||||
"narHash": "sha256-5z4pDqRSSovXPPtN1BNEJOkGoCd/XSYuCWh8AsvoTio=",
|
||||
"lastModified": 1730499477,
|
||||
"narHash": "sha256-olt0Sx4alDxv3ko9BgbV3SsE2KQ/Tf0/Az1Fr9s2Y6U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "42ea1626cb002fa759a6b1e2841bfc80a4e59615",
|
||||
"rev": "356896f58dde22ee16481b7c954e340dceec340d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -837,11 +837,11 @@
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1730411166,
|
||||
"narHash": "sha256-o1JcjEnWhnxkkKXYN1gQeO53RUsQExFsgMOJ/FzuFX0=",
|
||||
"lastModified": 1730540878,
|
||||
"narHash": "sha256-JYfoVW5lsfv4bo87U6mqbC3Jh+EBImU5iUsHJlOkyAI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "761c6a7d6859126681d206126ba26ec58306d068",
|
||||
"rev": "57df81c2bcabc503171defb232a0e11710ddaaf9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -918,11 +918,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730348281,
|
||||
"narHash": "sha256-c5lP7JFqWlrEScvPXKxg7Z2+f5wdlznYZPjEa5jmEkw=",
|
||||
"lastModified": 1730521028,
|
||||
"narHash": "sha256-vZtg4J+jOADDKgS+s821PeJiTXfawan8mzX3JM3xjqc=",
|
||||
"owner": "gerg-l",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "22d250d6a4dcc492a2d8836d3f2c901a09e7cb76",
|
||||
"rev": "191323d81e19efa0be5071e17263851e62f35685",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -67,6 +67,8 @@
|
||||
) {}
|
||||
colors;
|
||||
in {
|
||||
homeManagerModules.default = ./modules/home;
|
||||
|
||||
nixosConfigurations = {
|
||||
oganesson = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
@@ -75,7 +77,8 @@
|
||||
};
|
||||
inherit system;
|
||||
modules = [
|
||||
./hosts/desktop
|
||||
./hosts/desktop/config.nix
|
||||
./modules/sys
|
||||
stylix.nixosModules.stylix
|
||||
nixvim.nixosModules.nixvim
|
||||
nur.nixosModules.nur
|
||||
@@ -88,7 +91,8 @@
|
||||
inherit self inputs scheme wallpaper username;
|
||||
};
|
||||
modules = [
|
||||
./hosts/laptop
|
||||
./hosts/laptop/config.nix
|
||||
./modules/sys
|
||||
stylix.nixosModules.stylix
|
||||
nixvim.nixosModules.nixvim
|
||||
nur.nixosModules.nur
|
||||
@@ -102,6 +106,7 @@
|
||||
};
|
||||
modules = [
|
||||
./hosts/server
|
||||
./modules
|
||||
stylix.nixosModules.stylix
|
||||
nixvim.nixosModules.nixvim
|
||||
nur.nixosModules.nur
|
||||
|
||||
@@ -1,6 +1,25 @@
|
||||
{pkgs, ...}: {
|
||||
system.stateVersion = "24.05";
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./home.nix
|
||||
];
|
||||
|
||||
# My module options
|
||||
networkModule.enable = true;
|
||||
nixSettings.enable = true;
|
||||
bootLoader.enable = true;
|
||||
issue.enable = true;
|
||||
sddmConfig.enable = true;
|
||||
stylixConfig.enable = true;
|
||||
gamingPkgs.enable = true;
|
||||
steamConfig.enable = true;
|
||||
sysPkgs.enable = true;
|
||||
sysProgs.enable = true;
|
||||
sysServices.enable = true;
|
||||
virtConfig.enable = true;
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
host,
|
||||
inputs,
|
||||
username,
|
||||
nur,
|
||||
pkgs,
|
||||
self,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./../../modules/sys/configuration.nix
|
||||
./hardware.nix
|
||||
./settings.nix
|
||||
];
|
||||
}
|
||||
96
hosts/desktop/home.nix
Normal file
96
hosts/desktop/home.nix
Normal file
@@ -0,0 +1,96 @@
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
wallpaper,
|
||||
lib,
|
||||
scheme,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
nur = config.nur;
|
||||
in {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = {inherit self inputs host wallpaper scheme username nur;};
|
||||
users = {
|
||||
${username} = {
|
||||
programs.home-manager.enable = true;
|
||||
imports = [
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
inputs.self.outputs.homeManagerModules.default
|
||||
];
|
||||
|
||||
# My custom home-manager modules
|
||||
|
||||
# modules/home/files
|
||||
homeFiles.enable = true;
|
||||
|
||||
# modules/home/environment
|
||||
hyprlandConfig.enable = true;
|
||||
autojumpConfig.enable = true;
|
||||
stylixHomeConfig.enable = true;
|
||||
waybarConfig.enable = true;
|
||||
gtkConfig.enable = true;
|
||||
spicetifyConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
|
||||
# modules/home/programs
|
||||
btopConfig.enable = true;
|
||||
swayncConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
cavaConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
firefoxConfig.enable = true;
|
||||
fuzzelConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
kittyConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
passConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
|
||||
# modules/home/scripts
|
||||
movScripts.enable = true;
|
||||
movScripts.commandScripts.enable = true;
|
||||
movScripts.hyprlandControls.enable = true;
|
||||
movScripts.nixShortcuts.enable = true;
|
||||
|
||||
dconf.settings = lib.mkIf config.virtConfig.enable {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
};
|
||||
};
|
||||
home = {
|
||||
username = "${username}";
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
groups.persist = {};
|
||||
users = {
|
||||
root.initialPassword = "1234";
|
||||
${username} = {
|
||||
isNormalUser = true;
|
||||
initialPassword = "1234";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = ["wheel" "persist" "libvirtd"];
|
||||
};
|
||||
};
|
||||
};
|
||||
security.sudo.extraConfig = ''
|
||||
${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
|
||||
'';
|
||||
nix.settings.allowed-users = ["${username}"];
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
boot = {
|
||||
kernelModules = ["acpi_call"];
|
||||
extraModulePackages = with config.boot.kernelPackages;
|
||||
[
|
||||
acpi_call
|
||||
cpupower
|
||||
]
|
||||
++ [pkgs.cpupower-gui];
|
||||
};
|
||||
}
|
||||
47
hosts/laptop/config.nix
Normal file
47
hosts/laptop/config.nix
Normal file
@@ -0,0 +1,47 @@
|
||||
{pkgs, config, ...}: {
|
||||
system.stateVersion = "24.05";
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./home.nix
|
||||
];
|
||||
|
||||
powerProfiles.enable = true;
|
||||
boot = {
|
||||
kernelModules = ["acpi_call"];
|
||||
extraModulePackages = with config.boot.kernelPackages;
|
||||
[
|
||||
acpi_call
|
||||
cpupower
|
||||
]
|
||||
++ [pkgs.cpupower-gui];
|
||||
};
|
||||
|
||||
networkModule.enable = true;
|
||||
nixSettings.enable = true;
|
||||
bootLoader.enable = true;
|
||||
issue.enable = true;
|
||||
sddmConfig.enable = true;
|
||||
stylixConfig.enable = true;
|
||||
sysPkgs.enable = true;
|
||||
sysProgs.enable = true;
|
||||
sysServices.enable = true;
|
||||
|
||||
environment = {
|
||||
variables = {
|
||||
PATH = "${pkgs.clang-tools}/bin:$PATH";
|
||||
};
|
||||
shells = with pkgs; [
|
||||
zsh
|
||||
bash
|
||||
];
|
||||
systemPackages = with pkgs; [
|
||||
acpi
|
||||
brightnessctl
|
||||
cpupower-gui
|
||||
powertop
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
{
|
||||
host,
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
self,
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./../../modules/sys/configuration.nix
|
||||
./hardware.nix
|
||||
./boot.nix
|
||||
./services.nix
|
||||
./environment.nix
|
||||
./settings.nix
|
||||
];
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
{pkgs, ...}: {
|
||||
environment = {
|
||||
variables = {
|
||||
PATH = "${pkgs.clang-tools}/bin:$PATH";
|
||||
};
|
||||
shells = with pkgs; [
|
||||
zsh
|
||||
bash
|
||||
];
|
||||
systemPackages = with pkgs; [
|
||||
acpi
|
||||
brightnessctl
|
||||
cpupower-gui
|
||||
powertop
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,53 +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,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-partlabel/disk-main-root";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-partlabel/disk-main-nix";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-partlabel/disk-main-ESP";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-partlabel/disk-main-home";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
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.enp14s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
96
hosts/laptop/home.nix
Normal file
96
hosts/laptop/home.nix
Normal file
@@ -0,0 +1,96 @@
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
wallpaper,
|
||||
lib,
|
||||
scheme,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
nur = config.nur;
|
||||
in {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = {inherit self inputs host wallpaper scheme username nur;};
|
||||
users = {
|
||||
${username} = {
|
||||
programs.home-manager.enable = true;
|
||||
imports = [
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
inputs.self.outputs.homeManagerModules.default
|
||||
];
|
||||
|
||||
# My custom home-manager modules
|
||||
|
||||
# modules/home/files
|
||||
homeFiles.enable = true;
|
||||
|
||||
# modules/home/environment
|
||||
hyprlandConfig.enable = true;
|
||||
autojumpConfig.enable = true;
|
||||
stylixHomeConfig.enable = true;
|
||||
waybarConfig.enable = true;
|
||||
gtkConfig.enable = true;
|
||||
spicetifyConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
|
||||
# modules/home/programs
|
||||
btopConfig.enable = true;
|
||||
swayncConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
cavaConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
firefoxConfig.enable = true;
|
||||
fuzzelConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
kittyConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
passConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
|
||||
# modules/home/scripts
|
||||
movScripts.enable = true;
|
||||
movScripts.commandScripts.enable = true;
|
||||
movScripts.hyprlandControls.enable = true;
|
||||
movScripts.nixShortcuts.enable = true;
|
||||
|
||||
dconf.settings = lib.mkIf config.virtConfig.enable {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
};
|
||||
};
|
||||
home = {
|
||||
username = "${username}";
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
groups.persist = {};
|
||||
users = {
|
||||
root.initialPassword = "1234";
|
||||
${username} = {
|
||||
isNormalUser = true;
|
||||
initialPassword = "1234";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = ["wheel" "persist" "libvirtd"];
|
||||
};
|
||||
};
|
||||
};
|
||||
security.sudo.extraConfig = ''
|
||||
${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
|
||||
'';
|
||||
nix.settings.allowed-users = ["${username}"];
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
{...}: {
|
||||
services = {
|
||||
keyd = {
|
||||
enable = true;
|
||||
keyboards.default = {
|
||||
ids = ["*"];
|
||||
settings.main = {
|
||||
capslock = "esc";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
power-profiles-daemon.enable = true;
|
||||
|
||||
upower = {
|
||||
enable = true;
|
||||
percentageLow = 20;
|
||||
percentageCritical = 5;
|
||||
percentageAction = 3;
|
||||
criticalPowerAction = "PowerOff";
|
||||
};
|
||||
|
||||
tlp.settings = {
|
||||
CPU_ENERGY_PERF_POLICY_ON_AC = "power";
|
||||
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
|
||||
|
||||
CPU_BOOST_ON_AC = 1;
|
||||
CPU_BOOST_ON_BAT = 1;
|
||||
|
||||
CPU_HWP_DYN_BOOST_ON_AC = 1;
|
||||
CPU_HWP_DYN_BOOST_ON_BAT = 1;
|
||||
|
||||
PLATFORM_PROFILE_ON_AC = "performance";
|
||||
PLATFORM_PROFILE_ON_BAT = "performance";
|
||||
|
||||
INTEL_GPU_MIN_FREQ_ON_AC = 500;
|
||||
INTEL_GPU_MIN_FREQ_ON_BAT = 500;
|
||||
# INTEL_GPU_MAX_FREQ_ON_AC=0;
|
||||
# INTEL_GPU_MAX_FREQ_ON_BAT=0;
|
||||
# INTEL_GPU_BOOST_FREQ_ON_AC=0;
|
||||
# INTEL_GPU_BOOST_FREQ_ON_BAT=0;
|
||||
|
||||
PCIE_ASPM_ON_AC = "default";
|
||||
PCIE_ASPM_ON_BAT = "powersupersave";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{...}: {
|
||||
system.stateVersion = "24.05";
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix = {
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
substituters = ["https://nix-gaming.cachix.org"];
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
};
|
||||
|
||||
time.timeZone = "America/New_York";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
powerManagement.cpuFreqGovernor = "performance";
|
||||
}
|
||||
51
modules/home/default.nix
Normal file
51
modules/home/default.nix
Normal file
@@ -0,0 +1,51 @@
|
||||
{
|
||||
inputs,
|
||||
nixpkgs,
|
||||
config,
|
||||
self,
|
||||
username,
|
||||
host,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./programs
|
||||
./environment
|
||||
./scripts
|
||||
./files.nix
|
||||
];
|
||||
|
||||
# ./files
|
||||
homeFiles.enable = lib.mkDefault false;
|
||||
|
||||
# ./environment
|
||||
hyprlandConfig.enable = lib.mkDefault false;
|
||||
autojumpConfig.enable = lib.mkDefault false;
|
||||
stylixHomeConfig.enable = lib.mkDefault false;
|
||||
waybarConfig.enable = lib.mkDefault false;
|
||||
gtkConfig.enable = lib.mkDefault false;
|
||||
spicetifyConfig.enable = lib.mkDefault false;
|
||||
starshipConfig.enable = lib.mkDefault false;
|
||||
|
||||
# ./programs
|
||||
btopConfig.enable = lib.mkDefault false;
|
||||
swayncConfig.enable = lib.mkDefault false;
|
||||
userPkgs.enable = lib.mkDefault false;
|
||||
cavaConfig.enable = lib.mkDefault false;
|
||||
ezaConfig.enable = lib.mkDefault false;
|
||||
firefoxConfig.enable = lib.mkDefault false;
|
||||
fuzzelConfig.enable = lib.mkDefault false;
|
||||
fzfConfig.enable = lib.mkDefault false;
|
||||
gitConfig.enable = lib.mkDefault false;
|
||||
kittyConfig.enable = lib.mkDefault false;
|
||||
yaziConfig.enable = lib.mkDefault false;
|
||||
zshConfig.enable = lib.mkDefault false;
|
||||
passConfig.enable = lib.mkDefault false;
|
||||
batConfig.enable = lib.mkDefault false;
|
||||
|
||||
# ./scripts
|
||||
movScripts.enable = lib.mkDefault false;
|
||||
movScripts.commandScripts.enable = lib.mkDefault false;
|
||||
movScripts.hyprlandControls.enable = lib.mkDefault false;
|
||||
movScripts.nixShortcuts.enable = lib.mkDefault false;
|
||||
}
|
||||
@@ -9,14 +9,15 @@
|
||||
home-manager,
|
||||
...
|
||||
}: {
|
||||
imports =
|
||||
[(import ./gtk.nix)]
|
||||
++ [(import ./spicetify.nix)]
|
||||
++ [(import ./stylix.nix)]
|
||||
++ [(import ./starship.nix)]
|
||||
++ [(import ./userpkgs.nix)]
|
||||
++ [(import ./zshell.nix)]
|
||||
++ [(import ./swaync.nix)]
|
||||
++ [(import ./waybar)]
|
||||
++ [(import ./hyprland)];
|
||||
imports = [
|
||||
./gtk.nix
|
||||
./spicetify.nix
|
||||
./stylix.nix
|
||||
./starship.nix
|
||||
./userpkgs.nix
|
||||
./zshell.nix
|
||||
./swaync.nix
|
||||
./hyprland.nix
|
||||
./waybar.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
{lib, config, pkgs, ... }: {
|
||||
options = {
|
||||
gtkConfig.enable = lib.mkEnableOption "enable my gtk options";
|
||||
};
|
||||
config = lib.mkIf config.gtkConfig.enable {
|
||||
fonts.fontconfig.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
(nerdfonts.override {
|
||||
@@ -32,4 +32,5 @@
|
||||
# package = pkgs.nerdfonts.override {fonts = ["Iosevka"];};
|
||||
#};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
242
modules/home/environment/hyprland.nix
Normal file
242
modules/home/environment/hyprland.nix
Normal file
@@ -0,0 +1,242 @@
|
||||
{inputs, pkgs, lib, config, username, host, ... }: let
|
||||
desktop = host == "oganesson";
|
||||
screenshot_bind =
|
||||
if desktop
|
||||
then [
|
||||
# My laptop does not have a printscreen button
|
||||
"super, print, exec, grimblast copy area"
|
||||
]
|
||||
else [
|
||||
"super, insert, exec, grimblast copy area"
|
||||
];
|
||||
in {
|
||||
options = {
|
||||
hyprlandConfig.enable = lib.mkEnableOption "enables my hyprland config";
|
||||
};
|
||||
config = lib.mkIf config.hyprlandConfig.enable {
|
||||
home.packages = with pkgs; [
|
||||
swaybg
|
||||
inputs.hypr-contrib.packages.${pkgs.system}.grimblast
|
||||
hyprpicker
|
||||
grim
|
||||
slurp
|
||||
wl-clip-persist
|
||||
wf-recorder
|
||||
glib
|
||||
wayland
|
||||
direnv
|
||||
];
|
||||
systemd.user.targets.hyprland-session.Unit.Wants = ["xdg-desktop-autostart.target"];
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
xwayland = {
|
||||
enable = true;
|
||||
};
|
||||
systemd.enable = true;
|
||||
};
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
monitor =
|
||||
if (host == "oganesson")
|
||||
then [
|
||||
"DP-1, 1920x1080@144, 1920x0, 1"
|
||||
"HDMI-A-1, 1920x1080, 0x0, 1"
|
||||
]
|
||||
else [
|
||||
"eDP-1, 1600x900, 0x0, 1"
|
||||
];
|
||||
|
||||
exec-once = [
|
||||
"waybar &"
|
||||
"swaync &"
|
||||
"wl-paste --type text --watch cliphist store &"
|
||||
"wl-paste --type image --watch cliphist store &"
|
||||
"wl-clip-persist --clipboard both"
|
||||
"systemctl --user import-environment &"
|
||||
"hash dbus-update-activation-environment 2>/dev/null &"
|
||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &"
|
||||
"aplay /home/${username}/sound/sys/login.wav &"
|
||||
];
|
||||
|
||||
workspace =
|
||||
if desktop
|
||||
then [
|
||||
"1,persistent=true,monitor:HDMI-A-1"
|
||||
"2,persistent=true,monitor:HDMI-A-1"
|
||||
"3,persistent=true,monitor:HDMI-A-1"
|
||||
"4,persistent=true,monitor:DP-1"
|
||||
"5,persistent=true,monitor:DP-1"
|
||||
"6,persistent=true,monitor:DP-1"
|
||||
]
|
||||
else [
|
||||
"1,persistent=true,monitor:eDP-1"
|
||||
"2,persistent=true,monitor:eDP-1"
|
||||
"3,persistent=true,monitor:eDP-1"
|
||||
"4,persistent=true,monitor:eDP-1"
|
||||
];
|
||||
|
||||
env = [
|
||||
"XDG_CONFIG_HOME,$HOME/.config"
|
||||
"XDG_DATA_HOME,$HOME/.local/share"
|
||||
"XDG_CACHE_HOME,$HOME/.cache"
|
||||
];
|
||||
layerrule = [
|
||||
"blur,waybar"
|
||||
"ignorezero,waybar"
|
||||
"blur,launcher"
|
||||
];
|
||||
windowrule = [
|
||||
"opacity 0.8,nemo"
|
||||
];
|
||||
|
||||
input = {
|
||||
kb_layout = "us";
|
||||
follow_mouse = 1;
|
||||
accel_profile = "flat";
|
||||
force_no_accel = 1;
|
||||
sensitivity = 0;
|
||||
};
|
||||
general = {
|
||||
"$mainMod" = "super";
|
||||
layout = "dwindle";
|
||||
gaps_in = 4;
|
||||
gaps_out = 8;
|
||||
border_size = 2;
|
||||
#"col.inactive_border" = "0xff${scheme.base01}";
|
||||
#"col.active_border" = "0xff${scheme.base0F}";
|
||||
border_part_of_window = false;
|
||||
no_border_on_floating = false;
|
||||
};
|
||||
misc = {
|
||||
disable_autoreload = true;
|
||||
disable_hyprland_logo = true;
|
||||
always_follow_on_dnd = true;
|
||||
layers_hog_keyboard_focus = true;
|
||||
animate_manual_resizes = false;
|
||||
enable_swallow = true;
|
||||
focus_on_activate = true;
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
no_gaps_when_only = false;
|
||||
force_split = 0;
|
||||
special_scale_factor = 1.0;
|
||||
split_width_multiplier = 1.0;
|
||||
use_active_for_splits = true;
|
||||
pseudotile = "yes";
|
||||
preserve_split = "yes";
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
special_scale_factor = 1;
|
||||
no_gaps_when_only = false;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 7;
|
||||
# active_opacity = 0.90;
|
||||
# inactive_opacity = 0.90;
|
||||
# fullscreen_opacity = 1.0;
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
# size = 1;
|
||||
# passes = 1;
|
||||
size = 4;
|
||||
passes = 1;
|
||||
brightness = 1;
|
||||
contrast = 1.400;
|
||||
ignore_opacity = true;
|
||||
popups = true;
|
||||
noise = 0;
|
||||
new_optimizations = true;
|
||||
xray = true;
|
||||
};
|
||||
|
||||
drop_shadow = true;
|
||||
|
||||
shadow_ignore_window = true;
|
||||
shadow_offset = "0 2";
|
||||
shadow_range = 20;
|
||||
shadow_render_power = 3;
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = true;
|
||||
|
||||
bezier = [
|
||||
"fluent_decel, 0, 0.2, 0.4, 1"
|
||||
"easeOutCirc, 0, 0.55, 0.45, 1"
|
||||
"easeOutCubic, 0.33, 1, 0.68, 1"
|
||||
"easeinoutsine, 0.37, 0, 0.63, 1"
|
||||
];
|
||||
|
||||
animation = [
|
||||
# Windows
|
||||
"windowsIn, 1, 3, easeOutCubic, popin 30%" # window open
|
||||
"windowsOut, 1, 3, fluent_decel, popin 70%" # window close.
|
||||
"windowsMove, 1, 2, easeinoutsine, slide" # everything in between, moving, dragging, resizing.
|
||||
|
||||
# Fade
|
||||
"fadeIn, 1, 3, easeOutCubic" # fade in (open) -> layers and windows
|
||||
"fadeOut, 1, 2, easeOutCubic" # fade out (close) -> layers and windows
|
||||
"fadeSwitch, 0, 1, easeOutCirc" # fade on changing activewindow and its opacity
|
||||
"fadeShadow, 1, 10, easeOutCirc" # fade on changing activewindow for shadows
|
||||
"fadeDim, 1, 4, fluent_decel" # the easing of the dimming of inactive windows
|
||||
"border, 1, 2.7, easeOutCirc" # for animating the border's color switch speed
|
||||
"borderangle, 1, 30, fluent_decel, once" # for animating the border's gradient angle - styles: once (default), loop
|
||||
"workspaces, 1, 4, easeOutCubic, fade" # styles: slide, slidevert, fade, slidefade, slidefadevert
|
||||
];
|
||||
|
||||
bind =
|
||||
[
|
||||
"super, up, exec, pactl set-sink-volume @default_sink@ +10%"
|
||||
"super, down, exec, pactl set-sink-volume @default_sink@ -10%"
|
||||
"super, t, exec, swaync-client -t -sw"
|
||||
"super, a, exec, firefox"
|
||||
"super, q, exec, kitty --title Kitty"
|
||||
"super shift, q, exec, [float;size 40% 30%;move onscreen cursor -50% -50%] kitty --title Kitty"
|
||||
"super, c, killactive,"
|
||||
"super, e, exec, nemo"
|
||||
"super, p, exec, [float;size 40% 25%;move onscreen cursor] [ ! -f /tmp/keyringfile ] && kitty toolbelt"
|
||||
"super shift, m, exit,"
|
||||
"super, m, exec, fuzzel"
|
||||
"super, r, exec, neovide"
|
||||
"super, b, togglesplit, # dwindle"
|
||||
"super, f, togglefloating"
|
||||
"super, g, fullscreen"
|
||||
"super, h, movefocus, l"
|
||||
"super, l, movefocus, r"
|
||||
"super, k, movefocus, u"
|
||||
"super, j, movefocus, d"
|
||||
"super shift, h, movewindow, l"
|
||||
"super shift, l, movewindow, r"
|
||||
"super shift, k, movewindow, u"
|
||||
"super shift, j, movewindow, d"
|
||||
"super, d, exec, switchmon"
|
||||
"super, 1, exec, hyprctl 'dispatch workspace 1'"
|
||||
"super, 2, exec, hyprctl 'dispatch workspace 2'"
|
||||
"super, 3, exec, hyprctl 'dispatch workspace 3'"
|
||||
"super, 4, exec, hyprctl 'dispatch workspace 4'"
|
||||
"super, 5, exec, hyprctl 'dispatch workspace 5'"
|
||||
"super, 6, exec, hyprctl 'dispatch workspace 6'"
|
||||
"super shift, 1, movetoworkspace, 1"
|
||||
"super shift, 2, movetoworkspace, 2"
|
||||
"super shift, 3, movetoworkspace, 3"
|
||||
"super shift, 4, movetoworkspace, 4"
|
||||
"super shift, 5, movetoworkspace, 5"
|
||||
"super shift, 6, movetoworkspace, 6"
|
||||
"super, s, togglespecialworkspace, magic"
|
||||
"super shift, s, movetoworkspace, special:magic"
|
||||
]
|
||||
++ screenshot_bind;
|
||||
bindm = [
|
||||
"super, mouse:272, movewindow"
|
||||
"super, mouse:273, resizewindow"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,221 +0,0 @@
|
||||
{
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}: let
|
||||
desktop = host == "oganesson";
|
||||
screenshot_bind =
|
||||
if desktop
|
||||
then [
|
||||
# My laptop does not have a printscreen button
|
||||
"super, print, exec, grimblast copy area"
|
||||
]
|
||||
else [
|
||||
"super, insert, exec, grimblast copy area"
|
||||
];
|
||||
in {
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
monitor =
|
||||
if (host == "oganesson")
|
||||
then [
|
||||
"DP-1, 1920x1080@144, 1920x0, 1"
|
||||
"HDMI-A-1, 1920x1080, 0x0, 1"
|
||||
]
|
||||
else [
|
||||
"eDP-1, 1600x900, 0x0, 1"
|
||||
];
|
||||
|
||||
exec-once = [
|
||||
"waybar &"
|
||||
"swaync &"
|
||||
"wl-paste --type text --watch cliphist store &"
|
||||
"wl-paste --type image --watch cliphist store &"
|
||||
"wl-clip-persist --clipboard both"
|
||||
"systemctl --user import-environment &"
|
||||
"hash dbus-update-activation-environment 2>/dev/null &"
|
||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &"
|
||||
"aplay /home/${username}/sound/sys/login.wav &"
|
||||
];
|
||||
|
||||
workspace =
|
||||
if desktop
|
||||
then [
|
||||
"1,persistent=true,monitor:HDMI-A-1"
|
||||
"2,persistent=true,monitor:HDMI-A-1"
|
||||
"3,persistent=true,monitor:HDMI-A-1"
|
||||
"4,persistent=true,monitor:DP-1"
|
||||
"5,persistent=true,monitor:DP-1"
|
||||
"6,persistent=true,monitor:DP-1"
|
||||
]
|
||||
else [
|
||||
"1,persistent=true,monitor:eDP-1"
|
||||
"2,persistent=true,monitor:eDP-1"
|
||||
"3,persistent=true,monitor:eDP-1"
|
||||
"4,persistent=true,monitor:eDP-1"
|
||||
];
|
||||
|
||||
env = [
|
||||
"XDG_CONFIG_HOME,$HOME/.config"
|
||||
"XDG_DATA_HOME,$HOME/.local/share"
|
||||
"XDG_CACHE_HOME,$HOME/.cache"
|
||||
];
|
||||
layerrule = [
|
||||
"blur,waybar"
|
||||
"ignorezero,waybar"
|
||||
"blur,launcher"
|
||||
];
|
||||
windowrule = [
|
||||
"opacity 0.8,nemo"
|
||||
];
|
||||
|
||||
input = {
|
||||
kb_layout = "us";
|
||||
follow_mouse = 1;
|
||||
accel_profile = "flat";
|
||||
force_no_accel = 1;
|
||||
sensitivity = 0;
|
||||
};
|
||||
general = {
|
||||
"$mainMod" = "super";
|
||||
layout = "dwindle";
|
||||
gaps_in = 4;
|
||||
gaps_out = 8;
|
||||
border_size = 2;
|
||||
#"col.inactive_border" = "0xff${scheme.base01}";
|
||||
#"col.active_border" = "0xff${scheme.base0F}";
|
||||
border_part_of_window = false;
|
||||
no_border_on_floating = false;
|
||||
};
|
||||
misc = {
|
||||
disable_autoreload = true;
|
||||
disable_hyprland_logo = true;
|
||||
always_follow_on_dnd = true;
|
||||
layers_hog_keyboard_focus = true;
|
||||
animate_manual_resizes = false;
|
||||
enable_swallow = true;
|
||||
focus_on_activate = true;
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
no_gaps_when_only = false;
|
||||
force_split = 0;
|
||||
special_scale_factor = 1.0;
|
||||
split_width_multiplier = 1.0;
|
||||
use_active_for_splits = true;
|
||||
pseudotile = "yes";
|
||||
preserve_split = "yes";
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
special_scale_factor = 1;
|
||||
no_gaps_when_only = false;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 7;
|
||||
# active_opacity = 0.90;
|
||||
# inactive_opacity = 0.90;
|
||||
# fullscreen_opacity = 1.0;
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
# size = 1;
|
||||
# passes = 1;
|
||||
size = 4;
|
||||
passes = 1;
|
||||
brightness = 1;
|
||||
contrast = 1.400;
|
||||
ignore_opacity = true;
|
||||
popups = true;
|
||||
noise = 0;
|
||||
new_optimizations = true;
|
||||
xray = true;
|
||||
};
|
||||
|
||||
drop_shadow = true;
|
||||
|
||||
shadow_ignore_window = true;
|
||||
shadow_offset = "0 2";
|
||||
shadow_range = 20;
|
||||
shadow_render_power = 3;
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = true;
|
||||
|
||||
bezier = [
|
||||
"fluent_decel, 0, 0.2, 0.4, 1"
|
||||
"easeOutCirc, 0, 0.55, 0.45, 1"
|
||||
"easeOutCubic, 0.33, 1, 0.68, 1"
|
||||
"easeinoutsine, 0.37, 0, 0.63, 1"
|
||||
];
|
||||
|
||||
animation = [
|
||||
# Windows
|
||||
"windowsIn, 1, 3, easeOutCubic, popin 30%" # window open
|
||||
"windowsOut, 1, 3, fluent_decel, popin 70%" # window close.
|
||||
"windowsMove, 1, 2, easeinoutsine, slide" # everything in between, moving, dragging, resizing.
|
||||
|
||||
# Fade
|
||||
"fadeIn, 1, 3, easeOutCubic" # fade in (open) -> layers and windows
|
||||
"fadeOut, 1, 2, easeOutCubic" # fade out (close) -> layers and windows
|
||||
"fadeSwitch, 0, 1, easeOutCirc" # fade on changing activewindow and its opacity
|
||||
"fadeShadow, 1, 10, easeOutCirc" # fade on changing activewindow for shadows
|
||||
"fadeDim, 1, 4, fluent_decel" # the easing of the dimming of inactive windows
|
||||
"border, 1, 2.7, easeOutCirc" # for animating the border's color switch speed
|
||||
"borderangle, 1, 30, fluent_decel, once" # for animating the border's gradient angle - styles: once (default), loop
|
||||
"workspaces, 1, 4, easeOutCubic, fade" # styles: slide, slidevert, fade, slidefade, slidefadevert
|
||||
];
|
||||
|
||||
bind =
|
||||
[
|
||||
"super, up, exec, pactl set-sink-volume @default_sink@ +10%"
|
||||
"super, down, exec, pactl set-sink-volume @default_sink@ -10%"
|
||||
"super, t, exec, swaync-client -t -sw"
|
||||
"super, a, exec, firefox"
|
||||
"super, q, exec, kitty --title Kitty"
|
||||
"super shift, q, exec, [float;size 40% 30%;move onscreen cursor -50% -50%] kitty --title Kitty"
|
||||
"super, c, killactive,"
|
||||
"super, e, exec, nemo"
|
||||
"super, p, exec, [float;size 40% 25%;move onscreen cursor] [ ! -f /tmp/keyringfile ] && kitty toolbelt"
|
||||
"super shift, m, exit,"
|
||||
"super, m, exec, fuzzel"
|
||||
"super, r, exec, neovide"
|
||||
"super, b, togglesplit, # dwindle"
|
||||
"super, f, togglefloating"
|
||||
"super, g, fullscreen"
|
||||
"super, h, movefocus, l"
|
||||
"super, l, movefocus, r"
|
||||
"super, k, movefocus, u"
|
||||
"super, j, movefocus, d"
|
||||
"super shift, h, movewindow, l"
|
||||
"super shift, l, movewindow, r"
|
||||
"super shift, k, movewindow, u"
|
||||
"super shift, j, movewindow, d"
|
||||
"super, d, exec, switchmon"
|
||||
"super, 1, exec, hyprctl 'dispatch workspace 1'"
|
||||
"super, 2, exec, hyprctl 'dispatch workspace 2'"
|
||||
"super, 3, exec, hyprctl 'dispatch workspace 3'"
|
||||
"super, 4, exec, hyprctl 'dispatch workspace 4'"
|
||||
"super, 5, exec, hyprctl 'dispatch workspace 5'"
|
||||
"super, 6, exec, hyprctl 'dispatch workspace 6'"
|
||||
"super shift, 1, movetoworkspace, 1"
|
||||
"super shift, 2, movetoworkspace, 2"
|
||||
"super shift, 3, movetoworkspace, 3"
|
||||
"super shift, 4, movetoworkspace, 4"
|
||||
"super shift, 5, movetoworkspace, 5"
|
||||
"super shift, 6, movetoworkspace, 6"
|
||||
"super, s, togglespecialworkspace, magic"
|
||||
"super shift, s, movetoworkspace, special:magic"
|
||||
]
|
||||
++ screenshot_bind;
|
||||
bindm = [
|
||||
"super, mouse:272, movewindow"
|
||||
"super, mouse:273, resizewindow"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
host,
|
||||
...
|
||||
}: {
|
||||
imports =
|
||||
[(import ./hyprland.nix)]
|
||||
++ [(import ./config.nix)];
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
swaybg
|
||||
inputs.hypr-contrib.packages.${pkgs.system}.grimblast
|
||||
hyprpicker
|
||||
grim
|
||||
slurp
|
||||
wl-clip-persist
|
||||
wf-recorder
|
||||
glib
|
||||
wayland
|
||||
direnv
|
||||
];
|
||||
systemd.user.targets.hyprland-session.Unit.Wants = ["xdg-desktop-autostart.target"];
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
xwayland = {
|
||||
enable = true;
|
||||
};
|
||||
systemd.enable = true;
|
||||
};
|
||||
}
|
||||
@@ -1,19 +1,15 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
scheme,
|
||||
...
|
||||
}: let
|
||||
{lib, config, pkgs, inputs, scheme, ... }: let
|
||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||
in {
|
||||
options = {
|
||||
spicetifyConfig.enable = lib.mkEnableOption "enable my spicetify options";
|
||||
};
|
||||
config = lib.mkIf config.spicetifyConfig.enable {
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"spotify"
|
||||
];
|
||||
|
||||
imports = [inputs.spicetify-nix.homeManagerModules.default];
|
||||
|
||||
programs.spicetify = {
|
||||
enable = true;
|
||||
enabledExtensions = with spicePkgs.extensions; [
|
||||
@@ -40,4 +36,5 @@ in {
|
||||
# misc = scheme.base0F;
|
||||
#};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
{config, lib, inputs, ... }: {
|
||||
options = {
|
||||
starshipConfig.enable = lib.mkEnableOption "enables my starship configuration";
|
||||
};
|
||||
config = lib.mkIf config.starshipConfig.enable {
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableZshIntegration = false;
|
||||
@@ -11,7 +11,7 @@
|
||||
right_format = "($custom)";
|
||||
|
||||
format = lib.concatStrings [
|
||||
"($username)($ssh_symbol)($hostname)(bold white)($cmd_duration)($character)"
|
||||
"($ssh_symbol)($username)($hostname)(bold white)($cmd_duration)($character)"
|
||||
"($git_branch)($git_status)($rust)($nix-shell)"
|
||||
"($directory)"
|
||||
"$line_break[ > ](bold #89b4fa)"
|
||||
@@ -51,7 +51,7 @@
|
||||
hostname = {
|
||||
ssh_symbol = "🌐";
|
||||
ssh_only = false;
|
||||
format = "[$ssh_symbol](bold blue)[$hostname](bold red)";
|
||||
format = "[@](bold blue)[$hostname](bold red)";
|
||||
};
|
||||
|
||||
custom.shellver = {
|
||||
@@ -62,4 +62,5 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
{
|
||||
pkgs,
|
||||
scheme,
|
||||
wallpaper,
|
||||
...
|
||||
}: {
|
||||
{lib, config, pkgs, scheme, wallpaper, ... }: {
|
||||
options = {
|
||||
stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options";
|
||||
};
|
||||
config = lib.mkIf config.stylixHomeConfig.enable {
|
||||
stylix = {
|
||||
enable = true;
|
||||
autoEnable = true;
|
||||
@@ -15,4 +14,5 @@
|
||||
btop.enable = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{pkgs, ...}: {
|
||||
{lib, config, pkgs, ...}: {
|
||||
options = {
|
||||
swayncConfig.enable = lib.mkEnableOption "enables my swaync configuration";
|
||||
};
|
||||
config = lib.mkIf config.swayncConfig.enable {
|
||||
home.packages = with pkgs; [swaynotificationcenter];
|
||||
xdg.configFile."swaync/style.css".text = ''
|
||||
@define-color shadow rgba(0, 0, 0, 0.25);
|
||||
@@ -740,4 +744,5 @@
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
host,
|
||||
...
|
||||
}: let
|
||||
{lib, config, pkgs, host, ... }: let
|
||||
desktop = host == "oganesson";
|
||||
extraFigletFonts = pkgs.fetchFromGitHub {
|
||||
owner = "xero";
|
||||
@@ -32,6 +28,10 @@
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
options = {
|
||||
userPkgs.enable = lib.mkEnableOption "enables my default user packages";
|
||||
};
|
||||
config = lib.mkIf config.userPkgs.enable {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
chafa
|
||||
@@ -63,4 +63,5 @@ in {
|
||||
python3
|
||||
]
|
||||
++ desktop_pkgs;
|
||||
};
|
||||
}
|
||||
|
||||
518
modules/home/environment/waybar.nix
Normal file
518
modules/home/environment/waybar.nix
Normal file
@@ -0,0 +1,518 @@
|
||||
{pkgs, scheme, host, lib, config, ...}:
|
||||
|
||||
let
|
||||
desktop = host == "oganesson";
|
||||
workspaces = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"1" = "一";
|
||||
"2" = "二";
|
||||
"3" = "三";
|
||||
"4" = "四";
|
||||
"5" = "五";
|
||||
"6" = "六";
|
||||
};
|
||||
persistent-workspaces =
|
||||
if desktop
|
||||
then {
|
||||
"HDMI-A-1" = [1 2 3];
|
||||
"DP-1" = [4 5 6];
|
||||
}
|
||||
else {
|
||||
"eDP-1" = [1 2 3 4];
|
||||
};
|
||||
};
|
||||
bg = {
|
||||
darkester = scheme.base00;
|
||||
darkest = scheme.base01;
|
||||
darker = scheme.base02;
|
||||
dark = scheme.base03;
|
||||
};
|
||||
fg = {
|
||||
lightester = scheme.base07;
|
||||
lightest = scheme.base06;
|
||||
lighter = scheme.base05;
|
||||
light = scheme.base04;
|
||||
};
|
||||
colors = {
|
||||
color0 = scheme.base08;
|
||||
color1 = scheme.base09;
|
||||
color2 = scheme.base0A;
|
||||
color3 = scheme.base0B;
|
||||
color4 = scheme.base0C;
|
||||
color5 = scheme.base0D;
|
||||
color6 = scheme.base0E;
|
||||
color7 = scheme.base0F;
|
||||
};
|
||||
monitors =
|
||||
if desktop
|
||||
then [
|
||||
"DP-1"
|
||||
"HDMI-A-1"
|
||||
]
|
||||
else [
|
||||
"eDP-1"
|
||||
];
|
||||
in {
|
||||
options = {
|
||||
waybarConfig.enable = lib.mkEnableOption "enables my waybar configuration";
|
||||
};
|
||||
config = {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar.overrideAttrs (oa: {
|
||||
mesonFlags = (oa.mesonFlags or []) ++ ["-Dexperimental=true"];
|
||||
});
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "bottom";
|
||||
output = builtins.elemAt monitors 0;
|
||||
position = "top";
|
||||
name = "mainBar";
|
||||
margin-left = 8;
|
||||
margin-top = 5;
|
||||
margin-right =
|
||||
if desktop
|
||||
then 8
|
||||
else 5;
|
||||
mode = "dock";
|
||||
"gtk-layer-shell" = true;
|
||||
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
"cava"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-right = [
|
||||
"group/hardware"
|
||||
"clock"
|
||||
"group/powerbtns"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = workspaces;
|
||||
|
||||
cava = {
|
||||
framerate = 30;
|
||||
autosens = 1;
|
||||
sensitivity = 1;
|
||||
bars = 14;
|
||||
lower_cutoff_freq = 50;
|
||||
higher_cutoff_freq = 10000;
|
||||
method = "pulse";
|
||||
source = "auto";
|
||||
hide_on_silence = true;
|
||||
stereo = true;
|
||||
reverse = true;
|
||||
bar_delimiter = 0;
|
||||
monstercat = false;
|
||||
waves = false;
|
||||
noise_reduction = 0.77;
|
||||
input_delay = 2;
|
||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
};
|
||||
|
||||
"group/hardware" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"custom/disk-icon"
|
||||
"memory"
|
||||
"cpu"
|
||||
];
|
||||
};
|
||||
|
||||
"custom/disk-icon" = {
|
||||
exec = ''
|
||||
df /dev/disk/by-partlabel/disk-main-home /dev/disk/by-partlabel/disk-main-nix | awk '
|
||||
function format(size) {
|
||||
if (size >= 1024) return sprintf("%.1fTB", size / 1024)
|
||||
else return sprintf("%.1fGB", size)
|
||||
}
|
||||
$6 == "/home" {
|
||||
home_usage = $3 / 1024 / 1024
|
||||
home_total = $2 / 1024 / 1024
|
||||
home_percent = $5
|
||||
sub(/%/,"",home_percent)
|
||||
}
|
||||
$6 == "/nix" {
|
||||
nix_usage = $3 / 1024 / 1024
|
||||
nix_total = $2 / 1024 / 1024
|
||||
nix_percent = $5
|
||||
}
|
||||
END {
|
||||
printf "{\"class\": \"disk-icon\", \"tooltip\": \"/home: %s / %s\\n/nix: %s / %s\", \"percentage\": \"%s\"}\n",
|
||||
format(home_usage), format(home_total), format(nix_usage), format(nix_total), home_percent
|
||||
}' | jq --unbuffered --compact-output
|
||||
'';
|
||||
interval = 60;
|
||||
return-type = "json";
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
memory = {
|
||||
interval = 1;
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
max-length = 10;
|
||||
tooltip-format = "RAM: {used:0.1f} GB / {total:0.1f} GB";
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 1;
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip-format = "CPU: {usage:0.1f}%";
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
on-click = "shutdown now";
|
||||
tooltip = false;
|
||||
format = " ";
|
||||
};
|
||||
|
||||
"custom/logout" = {
|
||||
on-click = "hyprctl dispatch exit";
|
||||
tooltip = false;
|
||||
format = " ";
|
||||
};
|
||||
|
||||
"custom/reboot" = {
|
||||
on-click = "reboot";
|
||||
tooltip = false;
|
||||
format = " ";
|
||||
};
|
||||
|
||||
"group/powerbtns" = {
|
||||
orientation = "horizontal";
|
||||
drawer = {
|
||||
transition-duration = 500;
|
||||
children-class = "power-drawer";
|
||||
transition-left-to-right = false;
|
||||
};
|
||||
modules = [
|
||||
"custom/power"
|
||||
"custom/logout"
|
||||
"custom/reboot"
|
||||
];
|
||||
};
|
||||
|
||||
clock = {
|
||||
format = "{:%I:%M %p}";
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
sideBar = {
|
||||
layer = "bottom";
|
||||
output =
|
||||
if desktop
|
||||
then builtins.elemAt monitors 1
|
||||
else builtins.elemAt monitors 0;
|
||||
position = "right";
|
||||
margin-top = 8;
|
||||
margin-right = 5;
|
||||
margin-bottom = 8;
|
||||
name = "sideBar";
|
||||
mode = "dock";
|
||||
"gtk-layer-shell" = true;
|
||||
|
||||
modules-left =
|
||||
if desktop
|
||||
then [
|
||||
"hyprland/workspaces"
|
||||
]
|
||||
else [
|
||||
"group/brightness"
|
||||
"battery"
|
||||
];
|
||||
modules-center = [
|
||||
];
|
||||
modules-right = [
|
||||
"network"
|
||||
"group/audio"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = workspaces;
|
||||
|
||||
"pulseaudio/slider" = {
|
||||
orientation = "vertical";
|
||||
};
|
||||
|
||||
"group/audio" = {
|
||||
orientation = "vertical";
|
||||
modules = [
|
||||
"pulseaudio/slider"
|
||||
"pulseaudio"
|
||||
];
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon}";
|
||||
format-muted = " ";
|
||||
format-icons = {
|
||||
default = [
|
||||
" "
|
||||
" "
|
||||
];
|
||||
};
|
||||
on-click = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
on-click-right = "hyprctl dispatch exec '[float;size 40% 55%] pavucontrol'";
|
||||
};
|
||||
|
||||
network = {
|
||||
interval = 30;
|
||||
format-wifi = " ";
|
||||
tooltip-format-wifi = "{essid} ({signalStrength}%)";
|
||||
format-ethernet = " ";
|
||||
tooltip-format-ethernet = "{ifname}";
|
||||
format-disconnected = " ";
|
||||
tooltip-format-disconnected = "Disconnected";
|
||||
on-click = "hyprctl dispatch exec '[float;size 40% 55%] kitty nmtui'";
|
||||
};
|
||||
|
||||
battery = {
|
||||
bat = "BAT1";
|
||||
interval = 1;
|
||||
tooltip-format = "{capacity}%\nTil empty: {time}";
|
||||
tooltip-format-charging = "{capacity}%\nTil full: {time}";
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
format-charging = "";
|
||||
};
|
||||
|
||||
"group/brightness" = {
|
||||
orientation = "vertical";
|
||||
modules = [
|
||||
"backlight"
|
||||
"backlight/slider"
|
||||
];
|
||||
};
|
||||
backlight = {
|
||||
format = "";
|
||||
tooltip = "{percentage}%";
|
||||
};
|
||||
"backlight/slider" = {
|
||||
min = 10;
|
||||
max = 100;
|
||||
orientation = "vertical";
|
||||
rotate = 180;
|
||||
};
|
||||
};
|
||||
};
|
||||
style = ''
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
font-size: 16px;
|
||||
font-family: "JetBrains Mono Nerd Font";
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
border-radius: 20px;
|
||||
border: 3px solid #${colors.color7};
|
||||
background: rgba(46,52,64,0.15);
|
||||
margin: 20px;
|
||||
}
|
||||
window#waybar.empty #window {
|
||||
background: none;
|
||||
}
|
||||
|
||||
#workspaces {
|
||||
margin: 3px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
background: #${fg.lightester};
|
||||
border-radius: 20px;
|
||||
color: #${bg.darkest};
|
||||
}
|
||||
|
||||
#cava {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px 3px 3px 6px;
|
||||
padding: 0px 15px 0px 15px;
|
||||
color: #${colors.color6};
|
||||
}
|
||||
|
||||
#window {
|
||||
margin: 3px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
padding: 0 15px 0 15px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#hardware {
|
||||
margin: 3px;
|
||||
padding: 0 10px 0 10px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#custom-disk-icon, #cpu, #memory {
|
||||
margin-bottom: 4px;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#custom-disk-icon {
|
||||
color: #${colors.color4};
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: #${colors.color1};
|
||||
}
|
||||
|
||||
#cpu {
|
||||
color: #${colors.color3};
|
||||
}
|
||||
|
||||
#clock {
|
||||
font-weight: bold;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 0 10px 0 10px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#powerbtns {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 0 5px 0 10px;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
color: #${colors.color0};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#custom-logout {
|
||||
color: #${colors.color4};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#custom-reboot {
|
||||
color: #${colors.color2};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#audio {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 5px 0 10px 0;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: #${colors.color4};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#backlight-slider slider,
|
||||
#pulseaudio-slider slider {
|
||||
background: #${colors.color4};
|
||||
background-color: transparent;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
#backlight-slider trough,
|
||||
#pulseaudio-slider trough {
|
||||
min-width: 9px;
|
||||
min-height: 90px;
|
||||
border-radius: 8px;
|
||||
background: #343434;
|
||||
}
|
||||
|
||||
#backlight-slider highlight,
|
||||
#pulseaudio-slider highlight {
|
||||
border-radius: 8px;
|
||||
background-color: #2096C0;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: #${colors.color3};
|
||||
font-size: 20px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 5px 0 5px 6px;
|
||||
}
|
||||
|
||||
#brightness {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 10px 0px 5px 0;
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: #${colors.color2};
|
||||
font-size: 18px;
|
||||
padding: 0 4px 0 0;
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: #${colors.color4};
|
||||
font-size: 20px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 5px 0 5px 0px;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{...}: {
|
||||
imports =
|
||||
[(import ./waybar.nix)]
|
||||
++ [(import ./settings.nix)]
|
||||
++ [(import ./style.nix)];
|
||||
}
|
||||
@@ -1,323 +0,0 @@
|
||||
{host, ...}:
|
||||
# Grocery list:
|
||||
# Clock
|
||||
# CPU/MEM meters
|
||||
# Home folder and Nix store storage tracking?
|
||||
# Workspaces (per monitor would be nice)
|
||||
# A separate bar for both monitors
|
||||
# secondary monitor will have a vertical bar on the left side
|
||||
# Can contain more info with two bars
|
||||
let
|
||||
desktop = host == "oganesson";
|
||||
workspaces = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"1" = "一";
|
||||
"2" = "二";
|
||||
"3" = "三";
|
||||
"4" = "四";
|
||||
"5" = "五";
|
||||
"6" = "六";
|
||||
};
|
||||
persistent-workspaces =
|
||||
if desktop
|
||||
then {
|
||||
"HDMI-A-1" = [1 2 3];
|
||||
"DP-1" = [4 5 6];
|
||||
}
|
||||
else {
|
||||
"eDP-1" = [1 2 3 4];
|
||||
};
|
||||
};
|
||||
monitors =
|
||||
if desktop
|
||||
then [
|
||||
"DP-1"
|
||||
"HDMI-A-1"
|
||||
]
|
||||
else [
|
||||
"eDP-1"
|
||||
];
|
||||
in {
|
||||
programs.waybar.settings.mainBar = {
|
||||
layer = "bottom";
|
||||
output = builtins.elemAt monitors 0;
|
||||
position = "top";
|
||||
name = "mainBar";
|
||||
margin-left = 8;
|
||||
margin-top = 5;
|
||||
margin-right =
|
||||
if desktop
|
||||
then 8
|
||||
else 5;
|
||||
mode = "dock";
|
||||
"gtk-layer-shell" = true;
|
||||
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
"cava"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-right = [
|
||||
"group/hardware"
|
||||
"clock"
|
||||
"group/powerbtns"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = workspaces;
|
||||
|
||||
cava = {
|
||||
framerate = 30;
|
||||
autosens = 1;
|
||||
sensitivity = 1;
|
||||
bars = 14;
|
||||
lower_cutoff_freq = 50;
|
||||
higher_cutoff_freq = 10000;
|
||||
method = "pulse";
|
||||
source = "auto";
|
||||
hide_on_silence = true;
|
||||
stereo = true;
|
||||
reverse = true;
|
||||
bar_delimiter = 0;
|
||||
monstercat = false;
|
||||
waves = false;
|
||||
noise_reduction = 0.77;
|
||||
input_delay = 2;
|
||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
};
|
||||
|
||||
"group/hardware" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"custom/disk-icon"
|
||||
"memory"
|
||||
"cpu"
|
||||
];
|
||||
};
|
||||
|
||||
"custom/disk-icon" = {
|
||||
exec = ''
|
||||
df /dev/disk/by-partlabel/disk-main-home /dev/disk/by-partlabel/disk-main-nix | awk '
|
||||
function format(size) {
|
||||
if (size >= 1024) return sprintf("%.1fTB", size / 1024)
|
||||
else return sprintf("%.1fGB", size)
|
||||
}
|
||||
$6 == "/home" {
|
||||
home_usage = $3 / 1024 / 1024
|
||||
home_total = $2 / 1024 / 1024
|
||||
home_percent = $5
|
||||
sub(/%/,"",home_percent)
|
||||
}
|
||||
$6 == "/nix" {
|
||||
nix_usage = $3 / 1024 / 1024
|
||||
nix_total = $2 / 1024 / 1024
|
||||
nix_percent = $5
|
||||
}
|
||||
END {
|
||||
printf "{\"class\": \"disk-icon\", \"tooltip\": \"/home: %s / %s\\n/nix: %s / %s\", \"percentage\": \"%s\"}\n",
|
||||
format(home_usage), format(home_total), format(nix_usage), format(nix_total), home_percent
|
||||
}' | jq --unbuffered --compact-output
|
||||
'';
|
||||
interval = 60;
|
||||
return-type = "json";
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
memory = {
|
||||
interval = 1;
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
max-length = 10;
|
||||
tooltip-format = "RAM: {used:0.1f} GB / {total:0.1f} GB";
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 1;
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip-format = "CPU: {usage:0.1f}%";
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
on-click = "shutdown now";
|
||||
tooltip = false;
|
||||
format = " ";
|
||||
};
|
||||
|
||||
"custom/logout" = {
|
||||
on-click = "hyprctl dispatch exit";
|
||||
tooltip = false;
|
||||
format = " ";
|
||||
};
|
||||
|
||||
"custom/reboot" = {
|
||||
on-click = "reboot";
|
||||
tooltip = false;
|
||||
format = " ";
|
||||
};
|
||||
|
||||
"group/powerbtns" = {
|
||||
orientation = "horizontal";
|
||||
drawer = {
|
||||
transition-duration = 500;
|
||||
children-class = "power-drawer";
|
||||
transition-left-to-right = false;
|
||||
};
|
||||
modules = [
|
||||
"custom/power"
|
||||
"custom/logout"
|
||||
"custom/reboot"
|
||||
];
|
||||
};
|
||||
|
||||
clock = {
|
||||
format = "{:%I:%M %p}";
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
|
||||
# ------------------------------------------
|
||||
|
||||
programs.waybar.settings.sideBar = {
|
||||
layer = "bottom";
|
||||
output =
|
||||
if desktop
|
||||
then builtins.elemAt monitors 1
|
||||
else builtins.elemAt monitors 0;
|
||||
position = "right";
|
||||
margin-top = 8;
|
||||
margin-right = 5;
|
||||
margin-bottom = 8;
|
||||
name = "sideBar";
|
||||
mode = "dock";
|
||||
"gtk-layer-shell" = true;
|
||||
|
||||
modules-left =
|
||||
if desktop
|
||||
then [
|
||||
"hyprland/workspaces"
|
||||
]
|
||||
else [
|
||||
"group/brightness"
|
||||
"battery"
|
||||
];
|
||||
modules-center = [
|
||||
];
|
||||
modules-right = [
|
||||
"network"
|
||||
"group/audio"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = workspaces;
|
||||
|
||||
"pulseaudio/slider" = {
|
||||
orientation = "vertical";
|
||||
};
|
||||
|
||||
"group/audio" = {
|
||||
orientation = "vertical";
|
||||
modules = [
|
||||
"pulseaudio/slider"
|
||||
"pulseaudio"
|
||||
];
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon}";
|
||||
format-muted = " ";
|
||||
format-icons = {
|
||||
default = [
|
||||
" "
|
||||
" "
|
||||
];
|
||||
};
|
||||
on-click = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
on-click-right = "hyprctl dispatch exec '[float;size 40% 55%] pavucontrol'";
|
||||
};
|
||||
|
||||
network = {
|
||||
interval = 30;
|
||||
format-wifi = " ";
|
||||
tooltip-format-wifi = "{essid} ({signalStrength}%)";
|
||||
format-ethernet = " ";
|
||||
tooltip-format-ethernet = "{ifname}";
|
||||
format-disconnected = " ";
|
||||
tooltip-format-disconnected = "Disconnected";
|
||||
on-click = "hyprctl dispatch exec '[float;size 40% 55%] kitty nmtui'";
|
||||
};
|
||||
|
||||
battery = {
|
||||
bat = "BAT1";
|
||||
interval = 1;
|
||||
tooltip-format = "{capacity}%\nTil empty: {time}";
|
||||
tooltip-format-charging = "{capacity}%\nTil full: {time}";
|
||||
format = "{icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
format-charging = "";
|
||||
};
|
||||
|
||||
"group/brightness" = {
|
||||
orientation = "vertical";
|
||||
modules = [
|
||||
"backlight"
|
||||
"backlight/slider"
|
||||
];
|
||||
};
|
||||
backlight = {
|
||||
format = "";
|
||||
tooltip = "{percentage}%";
|
||||
};
|
||||
"backlight/slider" = {
|
||||
min = 10;
|
||||
max = 100;
|
||||
orientation = "vertical";
|
||||
rotate = 180;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,195 +0,0 @@
|
||||
{scheme, ...}: let
|
||||
bg = {
|
||||
darkester = scheme.base00;
|
||||
darkest = scheme.base01;
|
||||
darker = scheme.base02;
|
||||
dark = scheme.base03;
|
||||
};
|
||||
fg = {
|
||||
lightester = scheme.base07;
|
||||
lightest = scheme.base06;
|
||||
lighter = scheme.base05;
|
||||
light = scheme.base04;
|
||||
};
|
||||
colors = {
|
||||
color0 = scheme.base08;
|
||||
color1 = scheme.base09;
|
||||
color2 = scheme.base0A;
|
||||
color3 = scheme.base0B;
|
||||
color4 = scheme.base0C;
|
||||
color5 = scheme.base0D;
|
||||
color6 = scheme.base0E;
|
||||
color7 = scheme.base0F;
|
||||
};
|
||||
in {
|
||||
programs.waybar.style = ''
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
font-size: 16px;
|
||||
font-family: "JetBrains Mono Nerd Font";
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
border-radius: 20px;
|
||||
border: 3px solid #${colors.color7};
|
||||
background: rgba(46,52,64,0.15);
|
||||
margin: 20px;
|
||||
}
|
||||
window#waybar.empty #window {
|
||||
background: none;
|
||||
}
|
||||
|
||||
#workspaces {
|
||||
margin: 3px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
background: #${fg.lightester};
|
||||
border-radius: 20px;
|
||||
color: #${bg.darkest};
|
||||
}
|
||||
|
||||
#cava {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px 3px 3px 6px;
|
||||
padding: 0px 15px 0px 15px;
|
||||
color: #${colors.color6};
|
||||
}
|
||||
|
||||
#window {
|
||||
margin: 3px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
padding: 0 15px 0 15px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#hardware {
|
||||
margin: 3px;
|
||||
padding: 0 10px 0 10px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#custom-disk-icon, #cpu, #memory {
|
||||
margin-bottom: 4px;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#custom-disk-icon {
|
||||
color: #${colors.color4};
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: #${colors.color1};
|
||||
}
|
||||
|
||||
#cpu {
|
||||
color: #${colors.color3};
|
||||
}
|
||||
|
||||
#clock {
|
||||
font-weight: bold;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 0 10px 0 10px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#powerbtns {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 0 5px 0 10px;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
color: #${colors.color0};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#custom-logout {
|
||||
color: #${colors.color4};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#custom-reboot {
|
||||
color: #${colors.color2};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#audio {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 5px 0 10px 0;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: #${colors.color4};
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
#backlight-slider slider,
|
||||
#pulseaudio-slider slider {
|
||||
background: #${colors.color4};
|
||||
background-color: transparent;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
#backlight-slider trough,
|
||||
#pulseaudio-slider trough {
|
||||
min-width: 9px;
|
||||
min-height: 90px;
|
||||
border-radius: 8px;
|
||||
background: #343434;
|
||||
}
|
||||
|
||||
#backlight-slider highlight,
|
||||
#pulseaudio-slider highlight {
|
||||
border-radius: 8px;
|
||||
background-color: #2096C0;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: #${colors.color3};
|
||||
font-size: 20px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 5px 0 5px 6px;
|
||||
}
|
||||
|
||||
#brightness {
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 10px 0px 5px 0;
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: #${colors.color2};
|
||||
font-size: 18px;
|
||||
padding: 0 4px 0 0;
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: #${colors.color4};
|
||||
font-size: 20px;
|
||||
background: #${bg.dark};
|
||||
border-radius: 20px;
|
||||
margin: 3px;
|
||||
padding: 5px 0 5px 0px;
|
||||
}
|
||||
'';
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{pkgs, ...}: {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
};
|
||||
programs.waybar.package = pkgs.waybar.overrideAttrs (oa: {
|
||||
mesonFlags = (oa.mesonFlags or []) ++ ["-Dexperimental=true"];
|
||||
});
|
||||
}
|
||||
@@ -1,4 +1,8 @@
|
||||
{self, ...}: {
|
||||
{lib, config, self, ...}: {
|
||||
options = {
|
||||
zshConfig.enable = lib.mkEnableOption "enables my zsh configuration";
|
||||
};
|
||||
config = lib.mkIf config.zshConfig.enable {
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
@@ -6,6 +10,32 @@
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
|
||||
shellAliases = {
|
||||
grep = "grep --color=auto";
|
||||
yazi = "y";
|
||||
vi = "nvim";
|
||||
mv = "mv -v";
|
||||
cp = "cp -vr";
|
||||
gt = "gtrash";
|
||||
gtp = "playshellsound ${self}/assets/sound/rm.wav; gtrash put";
|
||||
sr = "source ~/.zshrc";
|
||||
".." = "cd ..";
|
||||
rm = "echo 'use \"gtp\" instead'";
|
||||
psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
|
||||
mkdir = "mkdir -p";
|
||||
pk = "pkill -9 -f";
|
||||
svcu = "systemctl --user";
|
||||
svc = "sudo systemctl";
|
||||
viflake = "nvim flake.nix";
|
||||
|
||||
#git
|
||||
"ga" = "playshellsound ${self}/assets/sound/gitadd.wav; git add";
|
||||
gcomm = "gitcommit_sfx";
|
||||
gpush = "gitpush_sfx";
|
||||
gpull = "gitpull_sfx";
|
||||
greb = "gitrebase_sfx";
|
||||
};
|
||||
|
||||
sessionVariables = {
|
||||
SOUNDS_ENABLED = "1";
|
||||
EDITOR = "nvim";
|
||||
@@ -34,31 +64,6 @@
|
||||
highlight = "fg=#4C566A,underline";
|
||||
};
|
||||
|
||||
shellAliases = {
|
||||
grep = "grep --color=auto";
|
||||
yazi = "y";
|
||||
vi = "nvim";
|
||||
mv = "mv -v";
|
||||
cp = "cp -vr";
|
||||
gt = "gtrash";
|
||||
gtp = "playshellsound ${self}/assets/sound/rm.wav; gtrash put";
|
||||
sr = "source ~/.zshrc";
|
||||
".." = "cd ..";
|
||||
rm = "echo 'use \"gtp\" instead'";
|
||||
psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
|
||||
mkdir = "mkdir -p";
|
||||
pk = "pkill -9 -f";
|
||||
svcu = "systemctl --user";
|
||||
svc = "sudo systemctl";
|
||||
viflake = "nvim flake.nix";
|
||||
|
||||
#git
|
||||
"ga" = "playshellsound ${self}/assets/sound/gitadd.wav; git add";
|
||||
gcomm = "gitcommit_sfx";
|
||||
gpush = "gitpush_sfx";
|
||||
gpull = "gitpull_sfx";
|
||||
greb = "gitrebase_sfx";
|
||||
};
|
||||
initExtra = ''
|
||||
playshellsound() {
|
||||
if [ $# -ne 1 ]; then
|
||||
@@ -71,6 +76,15 @@
|
||||
runbg aplay "$1"
|
||||
fi
|
||||
}
|
||||
gitcheckout_sfx() {
|
||||
if git checkout "$@"; then
|
||||
playshellsound ${self}/assets/sound/gitcheckout.wav
|
||||
return 0
|
||||
else
|
||||
playshellsound ${self}/assets/sound/error.wav
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
gitrebase_sfx() {
|
||||
if git rebase "$@"; then
|
||||
playshellsound ${self}/assets/sound/gitrebase.wav
|
||||
@@ -144,7 +158,6 @@
|
||||
setopt INC_APPEND_HISTORY # Append to the history file incrementally
|
||||
setopt SHARE_HISTORY # Share history between all zsh sessions
|
||||
|
||||
sessionVariables = {
|
||||
setopt CORRECT
|
||||
setopt NO_NOMATCH
|
||||
setopt LIST_PACKED
|
||||
@@ -184,4 +197,5 @@
|
||||
[ ! -f $FLAKEPATH/flake.nix ] && echo "WARNING: flake.nix not found at \$FLAKEPATH. Shell aliases for editing config files won't work correctly!" && echo "Edit the FLAKEPATH session variable in zshell.nix to point to the path where you saved the system configuration flake."
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
{self, ...}: {
|
||||
home.file.".config/neofetch/config.conf".text = ''
|
||||
{ lib, self, config, ... }:
|
||||
|
||||
# This folder is for programs that do not have existing configuration modules in NixOS.
|
||||
# Basically a to-do list for stuff I need to write my own modules for.
|
||||
{
|
||||
options = {
|
||||
homeFiles.enable = lib.mkEnableOption "enables declared custom files";
|
||||
};
|
||||
config = {
|
||||
home.file = {
|
||||
".config/neofetch/config.conf".text = ''
|
||||
username=$(whoami)
|
||||
name_length=''${#username}
|
||||
total_width=40
|
||||
@@ -106,4 +115,6 @@
|
||||
|
||||
stdout="off"
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
wallpaper,
|
||||
scheme,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
nur = config.nur;
|
||||
desktop = (host == "oganesson");
|
||||
in {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = {inherit self inputs host wallpaper scheme username nur;};
|
||||
users.${username} = {
|
||||
dconf.settings = if desktop then {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
};
|
||||
} else {};
|
||||
programs.home-manager.enable = true;
|
||||
imports = [
|
||||
./programs
|
||||
./environment
|
||||
./scripts
|
||||
./files.nix
|
||||
];
|
||||
home = {
|
||||
username = "${username}";
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
groups.persist = {};
|
||||
users = {
|
||||
root.initialPassword = "1234";
|
||||
${username} = {
|
||||
isNormalUser = true;
|
||||
initialPassword = "1234";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = ["wheel" "persist" "libvirtd"];
|
||||
};
|
||||
};
|
||||
};
|
||||
security.sudo.extraConfig = ''
|
||||
${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
|
||||
'';
|
||||
nix.settings.allowed-users = ["${username}"];
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
autojumpConfig.enable = lib.mkEnableOption "enables my autojump options";
|
||||
};
|
||||
config = lib.mkIf config.autojumpConfig.enable {
|
||||
programs.autojump = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
{inputs, ...}: {
|
||||
{lib, config, inputs, ...}: {
|
||||
options = {
|
||||
batConfig.enable = lib.mkEnableOption "enables my bat options";
|
||||
};
|
||||
config = lib.mkIf config.batConfig.enable {
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config = {
|
||||
pager = "less -FR";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{pkgs, ...}: {
|
||||
{lib, config, pkgs, ...}: {
|
||||
options = {
|
||||
btopConfig.enable = lib.mkEnableOption "enables my btop config";
|
||||
};
|
||||
config = lib.mkIf config.btopConfig.enable {
|
||||
programs.btop = {
|
||||
enable = true;
|
||||
|
||||
@@ -16,4 +20,5 @@
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [nvtopPackages.intel];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{lib, config, inputs, pkgs, ... }: {
|
||||
options = {
|
||||
cavaConfig.enable = lib.mkEnableOption "enables my cava settings";
|
||||
};
|
||||
config = lib.mkIf config.cavaConfig.enable {
|
||||
programs.cava = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
ezaConfig.enable = lib.mkEnableOption "enables my eza options";
|
||||
};
|
||||
config = lib.mkIf config.ezaConfig.enable {
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
enableZshIntegration = false;
|
||||
@@ -6,4 +10,5 @@
|
||||
icons = "auto";
|
||||
git = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
{
|
||||
nur,
|
||||
username,
|
||||
self,
|
||||
...
|
||||
}: {
|
||||
{lib, config, nur, username, self, ... }: {
|
||||
options = {
|
||||
firefoxConfig.enable = lib.mkEnableOption "enables my firefox configuration";
|
||||
};
|
||||
config = lib.mkIf config.firefoxConfig.enable {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
policies = {
|
||||
@@ -124,4 +123,5 @@
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{lib, ...}: {
|
||||
{config, lib, ...}: {
|
||||
options = {
|
||||
fuzzelConfig.enable = lib.mkEnableOption "enables my fuzzel configuration";
|
||||
};
|
||||
config = lib.mkIf config.fuzzelConfig.enable {
|
||||
programs.fuzzel = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -20,4 +24,5 @@
|
||||
colors.background = lib.mkForce "2e344080";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
fzfConfig.enable = lib.mkEnableOption "enables my fzf options";
|
||||
};
|
||||
config = lib.mkIf config.fzfConfig.enable {
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
{username, ...}: {
|
||||
{lib, config, username, ...}: {
|
||||
options = {
|
||||
gitConfig.enable = lib.mkEnableOption "enables my git configuration";
|
||||
};
|
||||
config = lib.mkIf config.gitConfig.enable {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userEmail = "${username}@gmail.com";
|
||||
userName = "${username}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
pkgs,
|
||||
scheme,
|
||||
...
|
||||
}: {
|
||||
{lib, config, pkgs, scheme, ... }: {
|
||||
options = {
|
||||
kittyConfig.enable = lib.mkEnableOption "enables my kitty configuration";
|
||||
};
|
||||
config = lib.mkIf config.kittyConfig.enable {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
||||
@@ -70,4 +70,5 @@
|
||||
color15 #${scheme.base07}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
{username, ...}: let
|
||||
{lib, config, username, ...}: let
|
||||
home = "/home/${username}";
|
||||
in {
|
||||
options = {
|
||||
passConfig.enable = lib.mkEnableOption "enables my pass config";
|
||||
};
|
||||
config = lib.mkIf config.passConfig.enable {
|
||||
programs.password-store = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PASSWORD_STORE_DIR = "${home}/.password-store";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
yaziConfig.enable = lib.mkEnableOption "enables my yazi config";
|
||||
};
|
||||
config = lib.mkIf config.yaziConfig.enable {
|
||||
programs.yazi = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,70 +1,94 @@
|
||||
{
|
||||
host,
|
||||
lib,
|
||||
config,
|
||||
self,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
keyring = import ./wm-controls/keyring.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
keyring = import ./wm-controls/keyring.nix { inherit self pkgs; };
|
||||
invoke = import ./commands/invoke.nix { inherit self pkgs; };
|
||||
splash = import ./commands/splash.nix { inherit self pkgs; };
|
||||
runbg = import ./commands/runbg.nix { inherit self pkgs; };
|
||||
garbage-collect = import ./nix/garbage-collect.nix { inherit self pkgs; };
|
||||
nsp = import ./nix/nsp.nix { inherit self pkgs; };
|
||||
scheck = import ./wm-controls/s_check.nix { inherit self pkgs; };
|
||||
switchmon = import ./wm-controls/switchmon.nix { inherit self pkgs; };
|
||||
rebuild = import ./nix/rebuild.nix { inherit host self pkgs; };
|
||||
moveonscreen = import ./wm-controls/moveonscreen.nix { inherit pkgs; };
|
||||
toolbelt = import ./commands/toolbelt.nix { inherit pkgs; };
|
||||
viconf = import ./commands/viconf.nix { inherit pkgs; };
|
||||
chscheme = import ./wm-controls/chscheme.nix { inherit pkgs; };
|
||||
chpaper = import ./wm-controls/chpaper.nix { inherit pkgs; };
|
||||
scriptOverride =
|
||||
doc:
|
||||
group:
|
||||
name:
|
||||
lib.mkEnableOption
|
||||
"${doc}" // {
|
||||
default = config.movScripts.enable && config.movScripts.${group}.enable;
|
||||
};
|
||||
invoke = import ./commands/invoke.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
splash = import ./commands/splash.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
scheck = import ./commands/s_check.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
runbg = import ./commands/runbg.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
garbage-collect = import ./nix/garbage-collect.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
nsp = import ./nix/nsp.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
switchmon = import ./wm-controls/switchmon.nix {
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
rebuild = import ./nix/rebuild.nix {
|
||||
host = host;
|
||||
self = self;
|
||||
pkgs = pkgs;
|
||||
};
|
||||
moveonscreen = import ./wm-controls/moveonscreen.nix {pkgs = pkgs;};
|
||||
toolbelt = import ./commands/toolbelt.nix {pkgs = pkgs;};
|
||||
viconf = import ./commands/viconf.nix {
|
||||
pkgs = pkgs;
|
||||
};
|
||||
chscheme = import ./wm-controls/chscheme.nix {
|
||||
pkgs = pkgs;
|
||||
};
|
||||
chpaper = import ./wm-controls/chpaper.nix {pkgs = pkgs;};
|
||||
in {
|
||||
home.packages = [
|
||||
chpaper
|
||||
chscheme
|
||||
keyring
|
||||
garbage-collect
|
||||
invoke
|
||||
rebuild
|
||||
nsp
|
||||
runbg
|
||||
scheck
|
||||
splash
|
||||
switchmon
|
||||
moveonscreen
|
||||
toolbelt
|
||||
viconf
|
||||
];
|
||||
options = {
|
||||
movScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts";
|
||||
|
||||
# Enable or disable by group
|
||||
movScripts.commandScripts.enable =
|
||||
lib.mkEnableOption "Enables all command scripts";
|
||||
movScripts.hyprlandControls.enable =
|
||||
lib.mkEnableOption "Enables all Hyprland control scripts";
|
||||
movScripts.nixShortcuts.enable =
|
||||
lib.mkEnableOption "Enables all Nix shortcut scripts";
|
||||
|
||||
# Individual options using scriptOverride or mkEnableOption directly
|
||||
movScripts.commandScripts.invoke.enable =
|
||||
scriptOverride "Enables the invoke command" "commandScripts" "invoke";
|
||||
movScripts.commandScripts.runbg.enable =
|
||||
scriptOverride "Enables the runbg command - written by FrostPhoenix" "commandScripts" "runbg";
|
||||
movScripts.commandScripts.splash.enable =
|
||||
scriptOverride "Enables the splash screen when opening a terminal" "commandScripts" "splash";
|
||||
movScripts.commandScripts.toolbelt.enable =
|
||||
scriptOverride "Enables the toolbelt command" "commandScripts" "toolbelt";
|
||||
movScripts.commandScripts.viconf.enable =
|
||||
scriptOverride "Enables the viconf command" "commandScripts" "viconf";
|
||||
|
||||
movScripts.hyprlandControls.chpaper.enable =
|
||||
scriptOverride "Enables the chpaper command" "hyprlandControls" "chpaper";
|
||||
movScripts.hyprlandControls.scheck.enable =
|
||||
scriptOverride "Enables the scheck command" "hyprlandControls" "scheck";
|
||||
movScripts.hyprlandControls.chscheme.enable =
|
||||
scriptOverride "Enables the chscheme command" "hyprlandControls" "chscheme";
|
||||
movScripts.hyprlandControls.keyring.enable =
|
||||
scriptOverride "Enables the keyring command" "hyprlandControls" "keyring";
|
||||
movScripts.hyprlandControls.moveonscreen.enable =
|
||||
scriptOverride "Ensures floating windows remain on screen" "hyprlandControls" "moveonscreen";
|
||||
movScripts.hyprlandControls.switchmon.enable =
|
||||
scriptOverride "Moves cursor to the center of the second monitor" "hyprlandControls" "switchmon";
|
||||
|
||||
movScripts.nixShortcuts.garbage-collect.enable =
|
||||
scriptOverride "Enables the garbage-collect script" "nixShortcuts" "garbage-collect";
|
||||
movScripts.nixShortcuts.nsp.enable =
|
||||
scriptOverride "Enables nsp as an alias for 'nix-shell -p'" "nixShortcuts" "nsp";
|
||||
movScripts.nixShortcuts.rebuild.enable =
|
||||
scriptOverride "Enables rebuild as an alias for 'sudo nixos-rebuild switch'" "nixShortcuts" "rebuild";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.movScripts.enable {
|
||||
home.packages = lib.optionals config.movScripts.commandScripts.invoke.enable [ invoke ]
|
||||
++ lib.optionals config.movScripts.commandScripts.runbg.enable [ runbg ]
|
||||
++ lib.optionals config.movScripts.commandScripts.splash.enable [ splash ]
|
||||
++ lib.optionals config.movScripts.commandScripts.toolbelt.enable [ toolbelt ]
|
||||
++ lib.optionals config.movScripts.commandScripts.viconf.enable [ viconf ]
|
||||
|
||||
++ lib.optionals config.movScripts.hyprlandControls.chpaper.enable [ chpaper ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.scheck.enable [ scheck ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.chscheme.enable [ chscheme ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.keyring.enable [ keyring ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.switchmon.enable [ switchmon ]
|
||||
|
||||
++ lib.optionals config.movScripts.nixShortcuts.garbage-collect.enable [ garbage-collect ]
|
||||
++ lib.optionals config.movScripts.nixShortcuts.nsp.enable [ nsp ]
|
||||
++ lib.optionals config.movScripts.nixShortcuts.rebuild.enable [ rebuild ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
nixpkgs,
|
||||
config,
|
||||
self,
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware
|
||||
./software
|
||||
./environment
|
||||
../home/home-manager.nix
|
||||
];
|
||||
}
|
||||
30
modules/sys/default.nix
Normal file
30
modules/sys/default.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
inputs,
|
||||
nixpkgs,
|
||||
config,
|
||||
self,
|
||||
username,
|
||||
host,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware
|
||||
./software
|
||||
./environment
|
||||
];
|
||||
|
||||
networkModule.enable = lib.mkDefault false;
|
||||
nixSettings.enable = lib.mkDefault false;
|
||||
bootLoader.enable = lib.mkDefault false;
|
||||
issue.enable = lib.mkDefault false;
|
||||
sddmConfig.enable = lib.mkDefault false;
|
||||
stylixConfig.enable = lib.mkDefault false;
|
||||
gamingPkgs.enable = lib.mkDefault false;
|
||||
steamConfig.enable = lib.mkDefault false;
|
||||
sysPkgs.enable = lib.mkDefault false;
|
||||
sysProgs.enable = lib.mkDefault false;
|
||||
sysServices.enable = lib.mkDefault false;
|
||||
virtConfig.enable = lib.mkDefault false;
|
||||
powerProfiles.enable = lib.mkDefault false;
|
||||
}
|
||||
@@ -11,5 +11,6 @@
|
||||
imports =
|
||||
[(import ./sddm.nix)]
|
||||
++ [(import ./issue.nix)]
|
||||
++ [(import ./nix.nix)]
|
||||
++ [(import ./stylix.nix)];
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty";
|
||||
};
|
||||
config = lib.mkIf config.issue.enable {
|
||||
environment.etc."issue".text = ''
|
||||
|
||||
\e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒
|
||||
@@ -26,4 +30,5 @@
|
||||
Run '\e[1;35mnixos-help\e[0m' for the NixOS manual.
|
||||
Run '\e[1;35mHyprland\e[0m' to enter the desktop environment.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
21
modules/sys/environment/nix.nix
Normal file
21
modules/sys/environment/nix.nix
Normal file
@@ -0,0 +1,21 @@
|
||||
{lib, config, ... }: {
|
||||
options = {
|
||||
nixSettings.enable = lib.mkEnableOption "enables my nixos settings";
|
||||
};
|
||||
config = lib.mkIf config.nixSettings.enable {
|
||||
nix = {
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
substituters = ["https://nix-gaming.cachix.org"];
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
};
|
||||
time.timeZone = "America/New_York";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
};
|
||||
}
|
||||
@@ -1,9 +1,14 @@
|
||||
{
|
||||
pkgs,
|
||||
self,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration";
|
||||
};
|
||||
config = lib.mkIf config.sddmConfig.enable {
|
||||
environment.systemPackages = [
|
||||
(
|
||||
pkgs.catppuccin-sddm.override {
|
||||
@@ -21,4 +26,5 @@
|
||||
theme = "catppuccin-mocha";
|
||||
package = pkgs.kdePackages.sddm;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,8 +2,14 @@
|
||||
pkgs,
|
||||
scheme,
|
||||
wallpaper,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
stylixConfig.enable = lib.mkEnableOption "enables custom stylix options";
|
||||
};
|
||||
config = lib.mkIf config.stylixConfig.enable {
|
||||
stylix = {
|
||||
enable = true;
|
||||
base16Scheme = scheme;
|
||||
@@ -43,4 +49,5 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
{pkgs, ...}: {
|
||||
{pkgs, lib, config, ...}: {
|
||||
options = {
|
||||
# make this enabled by default!!!
|
||||
bootLoader.enable = lib.mkEnableOption "enables bootloader config";
|
||||
};
|
||||
config = lib.mkIf config.bootLoader.enable {
|
||||
boot = {
|
||||
loader.systemd-boot.enable = true;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
loader.systemd-boot.configurationLimit = 10;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,5 +10,6 @@
|
||||
}: {
|
||||
imports =
|
||||
[(import ./bootloader.nix)]
|
||||
++ [(import ./network.nix)];
|
||||
++ [(import ./network.nix)]
|
||||
++ [(import ./powerprofiles.nix)];
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{host, ...}: let
|
||||
{host, lib, config, ...}: let
|
||||
desktop = host == "oganesson";
|
||||
in {
|
||||
options = {
|
||||
networkModule.enable = lib.mkEnableOption "enables network configuration";
|
||||
};
|
||||
config = lib.mkIf config.networkModule.enable {
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
hostName =
|
||||
@@ -8,13 +12,13 @@ in {
|
||||
then "oganesson"
|
||||
else "mercury";
|
||||
hosts = {
|
||||
"192.168.1.201" = ["glasshaus"];
|
||||
"192.168.1.201" = ["xenon"];
|
||||
"192.168.1.111" = ["argon"];
|
||||
"192.168.1.223" = ["mercury"];
|
||||
};
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [30000];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
43
modules/sys/hardware/powerprofiles.nix
Normal file
43
modules/sys/hardware/powerprofiles.nix
Normal file
@@ -0,0 +1,43 @@
|
||||
{lib, config, ... }: {
|
||||
options = {
|
||||
powerProfiles.enable = lib.mkEnableOption "enables power profiles";
|
||||
};
|
||||
config = lib.mkIf config.powerProfiles.enable {
|
||||
services = {
|
||||
|
||||
power-profiles-daemon.enable = true;
|
||||
|
||||
upower = {
|
||||
enable = true;
|
||||
percentageLow = 20;
|
||||
percentageCritical = 5;
|
||||
percentageAction = 3;
|
||||
criticalPowerAction = "PowerOff";
|
||||
};
|
||||
|
||||
tlp.settings = {
|
||||
CPU_ENERGY_PERF_POLICY_ON_AC = "power";
|
||||
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
|
||||
|
||||
CPU_BOOST_ON_AC = 1;
|
||||
CPU_BOOST_ON_BAT = 1;
|
||||
|
||||
CPU_HWP_DYN_BOOST_ON_AC = 1;
|
||||
CPU_HWP_DYN_BOOST_ON_BAT = 1;
|
||||
|
||||
PLATFORM_PROFILE_ON_AC = "performance";
|
||||
PLATFORM_PROFILE_ON_BAT = "performance";
|
||||
|
||||
INTEL_GPU_MIN_FREQ_ON_AC = 500;
|
||||
INTEL_GPU_MIN_FREQ_ON_BAT = 500;
|
||||
# INTEL_GPU_MAX_FREQ_ON_AC=0;
|
||||
# INTEL_GPU_MAX_FREQ_ON_BAT=0;
|
||||
# INTEL_GPU_BOOST_FREQ_ON_AC=0;
|
||||
# INTEL_GPU_BOOST_FREQ_ON_BAT=0;
|
||||
|
||||
PCIE_ASPM_ON_AC = "default";
|
||||
PCIE_ASPM_ON_BAT = "powersupersave";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -6,17 +6,13 @@
|
||||
username,
|
||||
host,
|
||||
...
|
||||
}: let
|
||||
desktop = host == "oganesson";
|
||||
desktop_modules =
|
||||
if desktop
|
||||
then [(import ./virtualization.nix)] ++ [(import ./gaming)]
|
||||
else [];
|
||||
in {
|
||||
}: {
|
||||
imports =
|
||||
[(import ./packages.nix)]
|
||||
++ [(import ./programs.nix)]
|
||||
++ [(import ./services.nix)]
|
||||
++ [(import ./nixvim)]
|
||||
++ desktop_modules;
|
||||
++ [(import ./module-test.nix)]
|
||||
++ [(import ./virtualization.nix)]
|
||||
++ [(import ./gaming)];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{pkgs, ...}: {
|
||||
{lib, config, pkgs, ...}: {
|
||||
options = {
|
||||
gamingPkgs.enable = lib.mkEnableOption "enables gaming packages";
|
||||
};
|
||||
config = lib.mkIf config.gamingPkgs.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
snes9x-gtk
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
steamConfig.enable = lib.mkEnableOption "enables steam configuration";
|
||||
};
|
||||
config = lib.mkIf config.steamConfig.enable {
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
11
modules/sys/software/module-test.nix
Normal file
11
modules/sys/software/module-test.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
options = {
|
||||
testmodule.enable = lib.mkEnableOption "enables test module";
|
||||
};
|
||||
config = lib.mkIf config.testmodule.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
hello
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
{lib, config, pkgs, inputs, ... }: {
|
||||
options = {
|
||||
sysPkgs.enable = lib.mkEnableOption "enables default system packages";
|
||||
};
|
||||
config = lib.mkIf config.sysPkgs.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
alejandra
|
||||
alsa-lib
|
||||
@@ -22,7 +22,6 @@
|
||||
gnumake
|
||||
gst_all_1.gstreamer
|
||||
htop
|
||||
hyprland
|
||||
hyprland-workspaces
|
||||
hyprpicker
|
||||
imagemagick
|
||||
@@ -45,6 +44,9 @@
|
||||
nix-prefetch-scripts
|
||||
nixos-option
|
||||
nix-search-cli
|
||||
nix-template
|
||||
mkdocs
|
||||
python3Packages.mkdocs-material
|
||||
nvd
|
||||
openssl
|
||||
p7zip
|
||||
@@ -76,4 +78,5 @@
|
||||
file
|
||||
libvirt-glib
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{pkgs, ...}: {
|
||||
{lib, config, pkgs, ...}: {
|
||||
options = {
|
||||
sysProgs.enable = lib.mkEnableOption "enables default system programs";
|
||||
};
|
||||
config = lib.mkIf config.sysProgs.enable {
|
||||
programs = {
|
||||
hyprland.enable = true;
|
||||
zsh.enable = true;
|
||||
@@ -14,4 +18,5 @@
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
{...}: {
|
||||
{lib, config, ...}: {
|
||||
options = {
|
||||
sysServices.enable = lib.mkEnableOption "enables default system services";
|
||||
};
|
||||
config = lib.mkIf config.sysServices.enable {
|
||||
services = {
|
||||
keyd = {
|
||||
enable = true;
|
||||
keyboards.default = {
|
||||
ids = ["*"];
|
||||
settings.main = {
|
||||
capslock = "esc";
|
||||
};
|
||||
};
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
@@ -16,4 +29,5 @@
|
||||
allowSFTP = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{username, ...}: {
|
||||
{lib, config, username, ...}: {
|
||||
options = {
|
||||
virtConfig.enable = lib.mkEnableOption "enables virtualization";
|
||||
};
|
||||
config = lib.mkIf config.virtConfig.enable {
|
||||
virtualisation.libvirtd.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user