tidying
This commit is contained in:
parent
35fad67a18
commit
0728b2f34c
9 changed files with 15 additions and 278 deletions
|
|
@ -6,10 +6,10 @@
|
|||
## Host-specific config files
|
||||
./network.nix
|
||||
./hardware.nix
|
||||
./bluetooth.nix
|
||||
## Shared 'core' config options
|
||||
../../../core
|
||||
## Host-specific core modules
|
||||
../../../core/bluetooth.nix
|
||||
../../../core/zfs.nix
|
||||
../../../core/sync.nix
|
||||
../../../core/gaming.nix
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
|
||||
{
|
||||
|
||||
imports = [
|
||||
./python.nix
|
||||
];
|
||||
imports = [ ];
|
||||
|
||||
## Activation Scripts
|
||||
## - these run after using `sudo nixos-rebuild switch`
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
python314
|
||||
] ++ (with pkgs.python314Packages; [
|
||||
#pip
|
||||
tkinter
|
||||
]);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -18,8 +18,9 @@ in {
|
|||
./hyprlock.nix # screen locker
|
||||
./wofi.nix # launcher
|
||||
./niri # WM
|
||||
#./sway # WM
|
||||
#./noctalia.nix # Desktop shell
|
||||
|
||||
## IMPORTED ELSEWHERE
|
||||
#./niri/noctalia.nix # Desktop shell
|
||||
|
||||
# Import user theme(s)
|
||||
../resources/theme
|
||||
|
|
@ -38,6 +39,7 @@ in {
|
|||
config = {
|
||||
common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
common.default = [ "gtk" "wlr" "gnome" ];
|
||||
#./sway # WM
|
||||
sway.default = [ "gtk" "wlr" "gnome" ];
|
||||
};
|
||||
configPackages = with pkgs; [
|
||||
|
|
@ -100,10 +102,7 @@ in {
|
|||
|
||||
home = {
|
||||
|
||||
file = {
|
||||
".icons/bibata".source =
|
||||
"${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
|
||||
};
|
||||
file.".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
|
||||
|
||||
pointerCursor = {
|
||||
gtk.enable = true;
|
||||
|
|
@ -166,19 +165,16 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
# GTK keyring for password prompts
|
||||
services.gnome-keyring.enable = true;
|
||||
|
||||
# MOVE TO SYNC.nix
|
||||
services = {
|
||||
## GTK keyring for password prompts
|
||||
gnome-keyring.enable = true;
|
||||
## Mobile <-> desktop interaction
|
||||
kdeconnect = {
|
||||
enable = false;
|
||||
indicator = true;
|
||||
};
|
||||
## MOVE TO SYNC.nix
|
||||
services.kdeconnect = {
|
||||
enable = false;
|
||||
indicator = true;
|
||||
};
|
||||
|
||||
# MOVE TO MORE SENSIBLE SPOT
|
||||
## MOVE TO MORE SENSIBLE SPOT
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "daily";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ in {
|
|||
imports = [
|
||||
inputs.niri.homeModules.niri
|
||||
#inputs.noctalia.homeModules.default
|
||||
../noctalia.nix
|
||||
./noctalia.nix
|
||||
./window-rules.nix
|
||||
#./visual.nix
|
||||
./binds.nix
|
||||
|
|
|
|||
|
|
@ -1,99 +0,0 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
with lib;
|
||||
with pkgs;
|
||||
let
|
||||
|
||||
in {
|
||||
imports = [ ./swayfx.nix ];
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
extraSessionCommands = ''
|
||||
export NIXOS_OZONE_WL=1
|
||||
export SDL_VIDEODRIVER=wayland,windows
|
||||
export QT_QPA_PLATFORM=wayland
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||
export XDG_CURRENT_DESKTOP=sway
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
export QT_QPA_PLATFORMTHEME=qt5ct
|
||||
'';
|
||||
extraConfig = "";
|
||||
xwayland = true;
|
||||
checkConfig = false;
|
||||
package = pkgs.swayfx;
|
||||
wrapperFeatures = {
|
||||
base = true;
|
||||
gtk = true;
|
||||
};
|
||||
systemd = {
|
||||
enable = true;
|
||||
#xdgAutostart = true;
|
||||
#extraCommands = [
|
||||
#];
|
||||
## Needed for soteria - https://github.com/NixOS/nixpkgs/issues/373290
|
||||
variables = [ "--all" ];
|
||||
};
|
||||
|
||||
swaynag = {
|
||||
enable = true;
|
||||
settings = { };
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
output = {
|
||||
eDP-1 = {
|
||||
## Set HIDP scale (pixel integer scaling)
|
||||
scale = "2";
|
||||
};
|
||||
};
|
||||
|
||||
defaultWorkspace = "workspace number 0";
|
||||
|
||||
## Use Wofi as menu
|
||||
menu = "menu";
|
||||
## Use kitty as default terminal
|
||||
terminal = "kitty";
|
||||
## Startup scripts and programs
|
||||
startup = [
|
||||
{ command = "startupExtra"; }
|
||||
{
|
||||
command = "startup";
|
||||
} # defined in `home/scripts/startup.nix`
|
||||
#{ command = "kitty"; }
|
||||
{ command = "kitty btop"; }
|
||||
];
|
||||
modifier = "Mod4";
|
||||
floating = {
|
||||
modifier = "Mod4";
|
||||
titlebar = false;
|
||||
};
|
||||
|
||||
## Window and focus settings
|
||||
window = { };
|
||||
focus = {
|
||||
followMouse = true;
|
||||
mouseWarping = false;
|
||||
newWindow = "smart";
|
||||
};
|
||||
|
||||
keybindings =
|
||||
mkOptionDefault (import ./keybinds.nix { inherit pkgs config; });
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
packages = with pkgs; [ ];
|
||||
|
||||
sessionVariables = {
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_CURRENT_DESKTOP = "sway";
|
||||
SDL_VIDEODRIVER = "wayland";
|
||||
# needs qt5.qtwayland in systemPackages
|
||||
QT_QPA_PLATFORM = "wayland";
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,142 +0,0 @@
|
|||
## Sway eyecandy options - https://github.com/WillPower3309/swayfx
|
||||
{ self, inputs, outputs, lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
|
||||
bg-color = "#424242";
|
||||
inactive-bg-color = "#424242";
|
||||
text-color = "#4f97d7";
|
||||
inactive-text-color = "#676E7D";
|
||||
urgent-bg-color = "#E53935";
|
||||
|
||||
colorSchemeDark = rec {
|
||||
primary = {
|
||||
normal = {
|
||||
background = "181818";
|
||||
foreground = "b9b9b9";
|
||||
};
|
||||
bright = {
|
||||
background = bright.black;
|
||||
foreground = bright.white;
|
||||
};
|
||||
};
|
||||
normal = {
|
||||
black = "252525";
|
||||
gray = "5b5b5b";
|
||||
red = "ed4a46";
|
||||
green = "70b433";
|
||||
yellow = "dbb32d";
|
||||
blue = "368aeb";
|
||||
magenta = "eb6eb7";
|
||||
cyan = "3fc5b7";
|
||||
white = "777777";
|
||||
};
|
||||
bright = {
|
||||
black = "3b3b3b";
|
||||
gray = "7b7b7b";
|
||||
red = "ff5e56";
|
||||
green = "83c746";
|
||||
yellow = "efc541";
|
||||
blue = "4f9cfe";
|
||||
magenta = "ff81ca";
|
||||
cyan = "56d8c9";
|
||||
white = "dedede";
|
||||
};
|
||||
};
|
||||
|
||||
colorScheme = colorSchemeDark;
|
||||
font = "Spleen-32x64";
|
||||
|
||||
bgColor = colorScheme.primary.normal.background;
|
||||
fgColor = colorScheme.primary.bright.foreground;
|
||||
acColor = colorScheme.normal.red;
|
||||
acColor2 = colorScheme.normal.yellow;
|
||||
|
||||
in {
|
||||
|
||||
imports = [ ];
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
extraSessionCommands = "";
|
||||
extraConfig = "
|
||||
default_border pixel 3
|
||||
smart_corner_radius enable
|
||||
corner_radius 15
|
||||
shadows enable
|
||||
shadows_on_csd enable
|
||||
shadow_blur_radius 10
|
||||
blur enable
|
||||
blur_xray disable
|
||||
blur_passes 4
|
||||
blur_radius 1
|
||||
";
|
||||
|
||||
config = rec {
|
||||
|
||||
## Use waybar as desktop statusbar
|
||||
bars = [{
|
||||
command = "${waybar}/bin/waybar";
|
||||
position = "top";
|
||||
fonts = { size = 15.0; };
|
||||
}];
|
||||
|
||||
## Borders
|
||||
window = {
|
||||
titlebar = false;
|
||||
border = 1;
|
||||
};
|
||||
floating = { border = 1; };
|
||||
gaps.smartBorders = "on";
|
||||
|
||||
## Gaps
|
||||
gaps = {
|
||||
inner = 5;
|
||||
outer = 5;
|
||||
smartGaps = false;
|
||||
};
|
||||
|
||||
## Fonts
|
||||
fonts = {
|
||||
names = [ "Spleen-32x64" ];
|
||||
size = 10.0;
|
||||
};
|
||||
|
||||
## Colours
|
||||
colors = {
|
||||
focused = {
|
||||
border = bg-color;
|
||||
childBorder = bg-color;
|
||||
background = bg-color;
|
||||
text = text-color;
|
||||
indicator = "#00ff00";
|
||||
};
|
||||
unfocused = {
|
||||
border = inactive-bg-color;
|
||||
childBorder = inactive-bg-color;
|
||||
background = inactive-bg-color;
|
||||
text = inactive-text-color;
|
||||
indicator = "#00ff00";
|
||||
};
|
||||
focusedInactive = {
|
||||
border = inactive-bg-color;
|
||||
childBorder = inactive-bg-color;
|
||||
background = inactive-bg-color;
|
||||
text = inactive-text-color;
|
||||
indicator = "#00ff00";
|
||||
};
|
||||
urgent = {
|
||||
border = urgent-bg-color;
|
||||
childBorder = urgent-bg-color;
|
||||
background = urgent-bg-color;
|
||||
text = text-color;
|
||||
indicator = "#00ff00";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue