pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: pixelifytica:4699339db35ea58ecf3455846c3b360833794ce5
Branches Tags
pixelifytica:main
pixelifytica:nvim
pixelifytica:custom_emacs_build
pixelifytica:cosmic
pixelifytica:stylix
pixelifytica:backup_pre_stylix
pixelifytica:backup_pre_merge
pixelifytica:backup_sway
pixelifytica:backup_pre_split
pixelifytica:release24.11
...
compare: pixelifytica:39aa431b1d67324737d724d57eda2f0b359e000b
Branches Tags
pixelifytica:main
pixelifytica:nvim
pixelifytica:custom_emacs_build
pixelifytica:cosmic
pixelifytica:stylix
pixelifytica:backup_pre_stylix
pixelifytica:backup_pre_merge
pixelifytica:backup_sway
pixelifytica:backup_pre_split
pixelifytica:release24.11

5 commits
4699339db3 ... 39aa431b1d

Author SHA1 Message Date
Evie Litherland-Smith 39aa431b1d Remove base16.nix and tt-schemes from flake inputs 
Use pkgs.base16-schemes instead of external flake input
 2024-09-20 08:41:00 +01:00
Evie Litherland-Smith 522f2fa91c Move fonts into stylix config, disable stylix waybar 
Remove fonts and scheme from base system, update uses of to point to
stylix instead.

Remove some left over files from the earlier rearrange.

Disable waybar stylix target - TODO write a custom moustache at some
point to re-enable with my custom style
 2024-09-20 08:33:10 +01:00
Evie Litherland-Smith 7e2ab5a640 Merge branch 'main' into stylix 2024-09-20 07:41:50 +01:00
Evie Litherland-Smith 56faa94663 Sway: fix swaylock bind 2024-09-19 08:06:20 +01:00
Evie Litherland-Smith 2ac1d1a63e Initial changes to add stylix again 
Add stylix with theme, font and image configuration.

Change all relevant (current) options to that nix evaluates without
error, not fully tested yet though.

Remove plasma manager and associated components.

Condensed some files - remove some standalone files for packages with
much smaller configuration now that they're not being manually themed.
 2024-09-19 08:05:48 +01:00
36 changed files with 532 additions and 1463 deletions
Show stats Expand all files Collapse all files

228
flake.lock
View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1721224776, "lastModified": 1708890466,
"narHash": "sha256-iakVQHg2DSmdOc5dNBwrDt9JLRxX5MT+IIbxfZEpGdo=", "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "c89c8123310257f3ddc04cc59aa4b5573c6d515f", "rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,14 +18,147 @@
"type": "github" "type": "github"
} }
}, },
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"type": "github"
}
},
"base16-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1720809814,
"narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721222302, "lastModified": 1689549921,
"narHash": "sha256-5vL4w9+tS9yd8WpIiDUtxN1IuxCVK2nebZMs/hCXXis=", "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "fromYaml", "repo": "fromYaml",
"rev": "93bad85d1633b8b27287b438c0bd394094c24d06", "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -34,6 +167,23 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -125,53 +275,61 @@
"type": "github" "type": "github"
} }
}, },
"plasma-manager": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager",
"iosevka-custom": "iosevka-custom",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2",
"stylix": "stylix"
}
},
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1725575977, "lastModified": 1726497442,
"narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=",
"owner": "nix-community", "owner": "danth",
"repo": "plasma-manager", "repo": "stylix",
"rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", "rev": "149b313ddf91c3cc94309170498b162cec666675",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "danth",
"repo": "plasma-manager", "repo": "stylix",
"type": "github" "type": "github"
} }
}, },
"root": { "systems": {
"inputs": {
"base16": "base16",
"home-manager": "home-manager",
"iosevka-custom": "iosevka-custom",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2",
"plasma-manager": "plasma-manager",
"tt-schemes": "tt-schemes"
}
},
"tt-schemes": {
"flake": false,
"locked": { "locked": {
"lastModified": 1725273692, "lastModified": 1681028828,
"narHash": "sha256-XOxESrzdIpcYMLS+s4D16M4c8gAk3sLyAQUvsb+lQLk=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "tinted-theming", "owner": "nix-systems",
"repo": "schemes", "repo": "default",
"rev": "992b6c372a00e284a7dc26b19a0d11b7afcba1f1", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "nix-systems",
"repo": "schemes", "repo": "default",
"type": "github" "type": "github"
} }
} }

9
flake.nix
View file

@ -12,8 +12,8 @@
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma-manager = { stylix = {
url = "github:nix-community/plasma-manager"; url = "github:danth/stylix";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager"; home-manager.follows = "home-manager";
@ -24,11 +24,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git"; iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git";
base16.url = "github:SenchoPens/base16.nix";
tt-schemes = {
url = "github:tinted-theming/schemes";
flake = false;
};
}; };
outputs = outputs =

51
system/default.nix
View file

@ -10,6 +10,7 @@
{ {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix
./${hostName}.nix ./${hostName}.nix
./hardware-configuration/${hostName}.nix ./hardware-configuration/${hostName}.nix
]; ];
@ -141,23 +142,6 @@
}; };
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
accentColourName = "base0E";
# Emulating stylix behaviour, rewrite at some point
fonts =
let
monospace.name = inputs.iosevka-custom.outputs.names.iosevka-custom-nerdfont;
serif.name = inputs.iosevka-custom.outputs.names.iosevka-custom-aile;
sansSerif.name = serif.name;
in
{
inherit monospace serif sansSerif;
sizes = {
applications = 12;
desktop = 14;
popups = 16;
terminal = 12;
};
};
}; };
}; };
environment = { environment = {
@ -210,6 +194,39 @@
time.timeZone = "Europe/London"; time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
console.useXkbConfig = true; console.useXkbConfig = true;
stylix = {
enable = true;
image = ./home/wallpapers/landscapes/tropic_island_day.jpg;
base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml";
opacity.popups = 0.8;
cursor = {
package = pkgs.volantes-cursors;
name = "volantes_cursors";
size = 32;
};
fonts =
let
proportional = {
package = inputs.iosevka-custom.outputs.packages.${pkgs.system}.iosevka-custom-aile;
name = inputs.iosevka-custom.outputs.names.iosevka-custom-aile;
};
monospace = {
package = inputs.iosevka-custom.outputs.packages.${pkgs.system}.iosevka-custom-nerdfont;
name = inputs.iosevka-custom.outputs.names.iosevka-custom-nerdfont;
};
in
{
inherit monospace;
serif = proportional;
sansSerif = proportional;
sizes = {
applications = 12;
desktop = 14;
popups = 16;
terminal = 12;
};
};
};
fonts = { fonts = {
packages = packages =
(with inputs.iosevka-custom.outputs.packages.${pkgs.system}; [ (with inputs.iosevka-custom.outputs.packages.${pkgs.system}; [

68
system/home/alacritty/default.nix
View file

@ -1,68 +0,0 @@
{ config, fonts, ... }:
{
programs.alacritty = {
enable = true;
settings = {
shell = "${config.programs.fish.package}/bin/fish";
font = {
size = fonts.sizes.applications;
normal = {
family = fonts.monospace.name;
style = "Regular";
};
};
window = {
dynamic_title = true;
padding = {
x = 5;
y = 5;
};
};
live_config_reload = true;
selection.save_to_clipboard = true;
mouse.hide_when_typing = true;
colors =
let
mapColours =
isBright:
(builtins.listToAttrs (
builtins.map
(col: {
# Alacritty uses Yellow instead of Orange for BASE09
name = if col == "orange" then "yellow" else col;
value = "0x${config.scheme.${if isBright then "bright-${col}" else col}}";
})
[
"red"
"orange"
"green"
"cyan"
"blue"
"magenta"
]
));
mapNamedColours = mapColours false;
mapNamedBrightColours = mapColours true;
in
{
draw_bold_text_with_bright_colors = false;
primary = {
background = "0x${config.scheme.base00}";
foreground = "0x${config.scheme.base05}";
};
cursor = {
cursor = "0x${config.scheme.base05}";
text = "0x${config.scheme.base00}";
};
normal = {
black = "0x${config.scheme.base00-hex}";
white = "0x${config.scheme.base05-hex}";
} // mapNamedColours;
bright = {
black = "0x${config.scheme.base03-hex}";
white = "0x${config.scheme.base07-hex}";
} // mapNamedBrightColours;
};
};
};
}

19
system/home/avizo/default.nix
View file

@ -1,19 +0,0 @@
{ config, accentColourName, ... }:
{
services.avizo = {
enable = true;
settings.default =
let
sc = config.scheme;
rgba =
colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
in
{
background = "rgba(${rgba "base00"}, 0.9)";
bar-bg-color = "rgba(${rgba "base00"}, 0.9)";
bar-fg-color = "rgba(${rgba "base05"}, 1.0)";
border-color = "rgba(${rgba accentColourName}, 1.0)";
image-opacity = "1.0";
};
};
}

92
system/home/base16/gtk.nix
View file

@ -1,92 +0,0 @@
{ scheme, accentColourName }:
with scheme.withHashtag;
''
@define-color accent_color ${scheme.withHashtag."${accentColourName}-hex"};
@define-color accent_bg_color ${scheme.withHashtag."${accentColourName}-hex"};
@define-color accent_fg_color ${base00-hex};
@define-color destructive_color ${base08-hex};
@define-color destructive_bg_color ${base08-hex};
@define-color destructive_fg_color ${base00-hex};
@define-color success_color ${base0B-hex};
@define-color success_bg_color ${base0B-hex};
@define-color success_fg_color ${base00-hex};
@define-color warning_color ${base0A-hex};
@define-color warning_bg_color ${base0A-hex};
@define-color warning_fg_color ${base00-hex};
@define-color error_color ${base08-hex};
@define-color error_bg_color ${base08-hex};
@define-color error_fg_color ${base00-hex};
@define-color window_bg_color ${base00-hex};
@define-color window_fg_color ${base05-hex};
@define-color view_bg_color ${base00-hex};
@define-color view_fg_color ${base05-hex};
@define-color headerbar_bg_color ${base01-hex};
@define-color headerbar_fg_color ${base05-hex};
@define-color headerbar_border_color rgba(${scheme.base01-dec-r}, ${scheme.base01-dec-g}, ${scheme.base01-dec-b}, 0.7);
@define-color headerbar_backdrop_color @window_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
@define-color sidebar_bg_color ${base01-hex};
@define-color sidebar_fg_color ${base05-hex};
@define-color sidebar_backdrop_color @window_bg_color;
@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
@define-color secondary_sidebar_bg_color @sidebar_bg_color;
@define-color secondary_sidebar_fg_color @sidebar_fg_color;
@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
@define-color secondary_sidebar_shade_color @sidebar_shade_color;
@define-color card_bg_color ${base01-hex};
@define-color card_fg_color ${base05-hex};
@define-color card_shade_color rgba(0, 0, 0, 0.07);
@define-color dialog_bg_color ${base01-hex};
@define-color dialog_fg_color ${base05-hex};
@define-color popover_bg_color ${base01-hex};
@define-color popover_fg_color ${base05-hex};
@define-color popover_shade_color rgba(0, 0, 0, 0.07);
@define-color shade_color rgba(0, 0, 0, 0.07);
@define-color scrollbar_outline_color ${base02-hex};
@define-color blue_1 ${base0D-hex};
@define-color blue_2 ${base0D-hex};
@define-color blue_3 ${base0D-hex};
@define-color blue_4 ${base0D-hex};
@define-color blue_5 ${base0D-hex};
@define-color green_1 ${base0B-hex};
@define-color green_2 ${base0B-hex};
@define-color green_3 ${base0B-hex};
@define-color green_4 ${base0B-hex};
@define-color green_5 ${base0B-hex};
@define-color yellow_1 ${base0A-hex};
@define-color yellow_2 ${base0A-hex};
@define-color yellow_3 ${base0A-hex};
@define-color yellow_4 ${base0A-hex};
@define-color yellow_5 ${base0A-hex};
@define-color orange_1 ${base09-hex};
@define-color orange_2 ${base09-hex};
@define-color orange_3 ${base09-hex};
@define-color orange_4 ${base09-hex};
@define-color orange_5 ${base09-hex};
@define-color red_1 ${base08-hex};
@define-color red_2 ${base08-hex};
@define-color red_3 ${base08-hex};
@define-color red_4 ${base08-hex};
@define-color red_5 ${base08-hex};
@define-color purple_1 ${base0E-hex};
@define-color purple_2 ${base0E-hex};
@define-color purple_3 ${base0E-hex};
@define-color purple_4 ${base0E-hex};
@define-color purple_5 ${base0E-hex};
@define-color brown_1 ${base0F-hex};
@define-color brown_2 ${base0F-hex};
@define-color brown_3 ${base0F-hex};
@define-color brown_4 ${base0F-hex};
@define-color brown_5 ${base0F-hex};
@define-color light_1 ${base01-hex};
@define-color light_2 ${base01-hex};
@define-color light_3 ${base01-hex};
@define-color light_4 ${base01-hex};
@define-color light_5 ${base01-hex};
@define-color dark_1 ${base01-hex};
@define-color dark_2 ${base01-hex};
@define-color dark_3 ${base01-hex};
@define-color dark_4 ${base01-hex};
@define-color dark_5 ${base01-hex};
''

1
system/home/browser/firefox.nix
View file

@ -1,5 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
stylix.targets.firefox.profileNames = [ "default" ];
programs = { programs = {
browserpass = { browserpass = {
enable = true; enable = true;

47
system/home/browser/nyxt.nix
View file

@ -1,17 +1,12 @@
{ { config, pkgs, ... }:
config,
pkgs,
fonts,
accentColourName,
...
}:
{ {
home.packages = [ pkgs.nyxt ]; home.packages = [ pkgs.nyxt ];
xdg = { xdg = {
configFile = { configFile = {
"nyxt/config.lisp".text = "nyxt/config.lisp".text =
let let
sc = config.scheme.withHashtag; fonts = config.stylix.fonts;
scheme = config.lib.stylix.scheme;
in in
'' ''
;; Import custom configuration ;; Import custom configuration
@ -22,24 +17,24 @@
:dark-p t :dark-p t
:font-family "${fonts.sansSerif.name}" :font-family "${fonts.sansSerif.name}"
:monospace-font-family "${fonts.monospace.name}" :monospace-font-family "${fonts.monospace.name}"
:background-color "${sc.base00}" :background-color "${scheme.withHashtag.base00}"
:on-background-color "${sc.base05}" :on-background-color "${scheme.withHashtag.base05}"
:primary-color "${sc.base02}" :primary-color "${scheme.withHashtag.base02}"
:on-primary-color "${sc.base05}" :on-primary-color "${scheme.withHashtag.base05}"
:secondary-color "${sc.base03}" :secondary-color "${scheme.withHashtag.base03}"
:on-secondary-color "${sc.base05}" :on-secondary-color "${scheme.withHashtag.base05}"
:accent-color "${sc.${accentColourName}}" :accent-color "${scheme.withHashtag.base0D}"
:on-accent-color "${sc.base01}" :on-accent-color "${scheme.withHashtag.base01}"
:action-color "${sc.cyan}" :action-color "${scheme.withHashtag.cyan}"
:on-action-color "${sc.base01}" :on-action-color "${scheme.withHashtag.base01}"
:success-color "${sc.green}" :success-color "${scheme.withHashtag.green}"
:on-success-color "${sc.base01}" :on-success-color "${scheme.withHashtag.base01}"
:highlight-color "${sc.magenta}" :highlight-color "${scheme.withHashtag.magenta}"
:on-highlight-color "${sc.base01}" :on-highlight-color "${scheme.withHashtag.base01}"
:warning-color "${sc.yellow}" :warning-color "${scheme.withHashtag.yellow}"
:on-warning-color "${sc.base01}" :on-warning-color "${scheme.withHashtag.base01}"
:codeblock-color "${sc.base02}" :codeblock-color "${scheme.withHashtag.base02}"
:on-codeblock-color "${sc.base05}")))) :on-codeblock-color "${scheme.withHashtag.base05}"))))
''; '';
}; };
dataFile."nyxt/bookmarks.lisp".text = dataFile."nyxt/bookmarks.lisp".text =

9
system/home/default.nix
View file

@ -1,17 +1,10 @@
{ inputs, osConfig, ... }: { inputs, ... }:
{ {
imports = [ imports = [
inputs.base16.homeManagerModule
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
inputs.plasma-manager.homeManagerModules.plasma-manager
./shell/default.nix ./shell/default.nix
./services/password-store/default.nix ./services/password-store/default.nix
./scripts/default.nix ./scripts/default.nix
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
scheme = "${inputs.tt-schemes}/base16/one-light.yaml";
fonts.fontconfig = {
enable = true;
inherit (osConfig.fonts.fontconfig) defaultFonts;
};
} }

69
system/home/desktop.nix
View file

@ -2,36 +2,37 @@
{ {
imports = [ imports = [
./sway/default.nix ./sway/default.nix
./alacritty/default.nix
./emacs/default.nix ./emacs/default.nix
./browser/default.nix ./browser/default.nix
./zathura/default.nix ./zathura/default.nix
./services/email/default.nix ./services/email/default.nix
]; ];
home = { home.packages = with pkgs; [
packages = with pkgs; [ libreoffice-fresh
libreoffice-fresh webcord
webcord signal-desktop
signal-desktop teams-for-linux
teams-for-linux ];
];
pointerCursor =
let
name = if config.scheme.variant == "light" then "volantes_cursors" else "volantes_light_cursors";
in
{
inherit name;
package = pkgs.volantes-cursors;
size = 32;
gtk.enable = config.gtk.enable;
x11 = {
enable = true;
defaultCursor = name;
};
};
};
services.syncthing.enable = true; services.syncthing.enable = true;
programs.mpv.enable = true; programs = {
mpv.enable = true;
alacritty = {
enable = true;
settings = {
shell = "${config.programs.fish.package}/bin/fish";
window = {
dynamic_title = true;
padding = {
x = 5;
y = 5;
};
};
live_config_reload = true;
selection.save_to_clipboard = true;
mouse.hide_when_typing = true;
};
};
};
xdg = { xdg = {
mime.enable = true; mime.enable = true;
mimeApps = mimeApps =
@ -67,24 +68,4 @@
}; };
}; };
}; };
xresources.properties = with config.scheme.withHashtag; {
"*background" = base00;
"*foreground" = base05;
"*color0" = base00;
"*color1" = red;
"*color2" = green;
"*color3" = yellow;
"*color4" = blue;
"*color5" = magenta;
"*color6" = cyan;
"*color7" = base04;
"*color8" = base01;
"*color9" = red;
"*color10" = green;
"*color11" = yellow;
"*color12" = blue;
"*color13" = magenta;
"*color14" = cyan;
"*color15" = base05;
};
} }

16
system/home/emacs/default.nix
View file

@ -1,11 +1,7 @@
{ { config, pkgs, ... }:
config,
pkgs,
fonts,
...
}:
{ {
imports = [ ../shell/default.nix ]; imports = [ ../shell/default.nix ];
stylix.targets.emacs.enable = false;
services.emacs = { services.emacs = {
enable = true; enable = true;
package = config.programs.emacs.finalPackage; package = config.programs.emacs.finalPackage;
@ -21,9 +17,11 @@
package = pkgs.emacs29-pgtk; package = pkgs.emacs29-pgtk;
extraConfig = extraConfig =
let let
fixed-font-family = "${fonts.monospace.name}"; fixed-font-family = "${config.stylix.fonts.monospace.name}";
variable-font-family = "${fonts.sansSerif.name}"; variable-font-family = "${config.stylix.fonts.sansSerif.name}";
font-height = builtins.toString (builtins.floor (builtins.mul fonts.sizes.applications 10)); font-height = builtins.toString (
builtins.floor (builtins.mul config.stylix.fonts.sizes.applications 10)
);
custom-theme-name = "nix"; custom-theme-name = "nix";
custom-theme = pkgs.writeTextFile { custom-theme = pkgs.writeTextFile {
name = "custom-emacs-theme"; name = "custom-emacs-theme";

48
system/home/foot/default.nix
View file

@ -1,48 +0,0 @@
{ config, fonts, ... }:
{
programs.foot = {
enable = true;
server.enable = true;
settings = {
main = {
term = "xterm-256color";
locked-title = false;
font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
dpi-aware = false;
pad = "10x10";
};
bell = {
urgent = false;
notify = false;
visual = false;
};
cursor = {
blink = true;
};
mouse = {
hide-when-typing = true;
};
colors = with config.scheme; rec {
alpha = 0.85;
background = base00;
foreground = base05;
regular0 = base02;
regular1 = red;
regular2 = green;
regular3 = yellow;
regular4 = blue;
regular5 = magenta;
regular6 = cyan;
regular7 = base05;
bright0 = base04;
bright1 = regular1;
bright2 = regular2;
bright3 = regular3;
bright4 = regular4;
bright5 = regular5;
bright6 = regular6;
bright7 = base05;
};
};
};
}

44
system/home/fuzzel/default.nix
View file

@ -1,44 +0,0 @@
{
config,
fonts,
accentColourName,
...
}:
{
programs.fuzzel = {
enable = true;
settings = {
main = {
dpi-aware = false;
font = "${fonts.monospace.name}:size=${toString fonts.sizes.popups}";
icon-theme = config.gtk.iconTheme.name;
icons-enabled = true;
fields = "filename,name,generic,categories";
fuzzy = true;
filter-desktop = true;
terminal = "${config.programs.alacritty.package}/bin/alacritty -e";
lines = 24;
width = 80;
tabs = 4;
layer = "overlay";
};
colors =
let
sc = config.scheme;
in
{
background = "${sc.base00}cc"; # 80% Opacity
text = "${sc.base05}ff";
match = "${sc.red}ff";
selection = "${sc.base01}ff";
selection-text = "${sc.base05}ff";
selection-match = "${sc.red}ff";
border = "${sc.${accentColourName}}ff";
};
border = {
width = 1;
radius = 5;
};
};
};
}

9
system/home/laptop.nix
View file

@ -1,9 +0,0 @@
{ ... }:
{
imports = [ ./desktop.nix ];
programs.plasma = {
configFile = {
bluedevilglobalrc.Global.launchState.value = "disable";
};
};
}

31
system/home/mako/default.nix
View file

@ -1,31 +0,0 @@
{
config,
fonts,
accentColourName,
...
}:
{
services.mako =
let
sc = config.scheme.withHashtag;
in
{
enable = true;
anchor = "top-right";
font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";
width = 600;
height = 600;
layer = "top";
markup = true;
maxVisible = 10;
icons = true;
iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
textColor = "${sc.base05}ff";
progressColor = "over ${sc.red}ff";
backgroundColor = "${sc.base00}cc";
borderColor = "${sc.${accentColourName}}ff";
borderRadius = 5;
borderSize = 1;
defaultTimeout = 0;
};
}

16
system/home/plasma/default.nix
View file

@ -2,8 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
fonts,
accentColourName,
... ...
}: }:
{ {
@ -25,8 +23,8 @@
{ {
clickItemTo = "open"; clickItemTo = "open";
theme = "default"; theme = "default";
colorScheme = "Breeze${toCapital config.scheme.variant}"; colorScheme = "Breeze${toCapital config.lib.stylix.scheme.variant}";
iconTheme = "Papirus-${toCapital config.scheme.variant}"; iconTheme = "Papirus-${toCapital config.lib.stylix.scheme.variant}";
windowDecorations = { windowDecorations = {
library = "org.kde.breeze"; library = "org.kde.breeze";
theme = "Breeze"; theme = "Breeze";
@ -41,7 +39,7 @@
fonts = fonts =
let let
general = { general = {
family = fonts.sansSerif.name; family = config.stylix.fonts.sansSerif.name;
pointSize = 12; pointSize = 12;
}; };
small = { small = {
@ -49,7 +47,7 @@
pointSize = general.pointSize - 2; pointSize = general.pointSize - 2;
}; };
fixedWidth = { fixedWidth = {
family = fonts.monospace.name; family = config.stylix.fonts.monospace.name;
pointSize = 12; pointSize = 12;
}; };
in in
@ -286,9 +284,9 @@
let let
AccentColor = AccentColor =
let let
r = config.scheme."${accentColourName}-rgb-r"; r = config.lib.stylix.scheme."base0D-rgb-r";
g = config.scheme."${accentColourName}-rgb-g"; g = config.lib.stylix.scheme."base0D-rgb-g";
b = config.scheme."${accentColourName}-rgb-b"; b = config.lib.stylix.scheme."base0D-rgb-b";
in in
"${r}, ${g}, ${b}"; "${r}, ${g}, ${b}";
in in

11
system/home/plasma/konsole.nix
View file

@ -1,9 +1,4 @@
{ { config, pkgs, ... }:
config,
pkgs,
fonts,
...
}:
{ {
home.packages = [ pkgs.yakuake ]; home.packages = [ pkgs.yakuake ];
programs.konsole = { programs.konsole = {
@ -15,8 +10,8 @@
colorScheme = "onelight"; colorScheme = "onelight";
command = "${config.programs.fish.package}/bin/fish"; command = "${config.programs.fish.package}/bin/fish";
font = { font = {
name = fonts.monospace.name; inherit (config.stylix.fonts.monospace) name;
size = fonts.sizes.terminal; size = config.stylix.fonts.sizes.terminal;
}; };
extraConfig = { extraConfig = {
"Interaction Options" = { "Interaction Options" = {

144
system/home/rofi/default.nix
View file

@ -1,144 +0,0 @@
{
config,
pkgs,
fonts,
accentColourName,
...
}:
{
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
terminal =
with config.programs;
"${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty";
font = fonts.monospace.name;
location = "center";
plugins = with pkgs; [ rofi-emoji ];
extraConfig = {
modi = "run,drun,ssh,window,emoji,combi";
combi-modi = "drun,ssh,window,emoji";
sidebar-mode = true;
sort = true;
sorting-method = "fzf";
matching = "fuzzy";
icon-theme = config.gtk.iconTheme.name;
show-icons = true;
application-fallback-icon = "application-x-addon";
drun-display-format = "{icon} {name} ({categories})";
disable-history = false;
hide-scrollbar = true;
display-run = " 󰅴 Run ";
display-drun = " 󱓞 Apps ";
display-ssh = " 󰢹 SSH ";
display-window = " 󰧨 Move ";
display-emoji = " 󰞅 Emoji ";
display-combi = " 󰛡 Combi ";
};
theme =
with builtins;
let
inherit (config.lib.formats.rasi) mkLiteral;
sc = config.scheme;
bg = mkLiteral "rgba (${sc.base00-rgb-r}, ${sc.base00-rgb-g}, ${sc.base00-rgb-b}, 80%)";
bg2 = mkLiteral "rgba (${sc.base01-rgb-r}, ${sc.base01-rgb-g}, ${sc.base01-rgb-b}, 100%)";
fg = mkLiteral sc.withHashtag.base05;
fg2 = mkLiteral sc.withHashtag.base04;
border = mkLiteral sc.withHashtag.${accentColour};
blue = mkLiteral sc.withHashtag.blue;
in
{
"*" = {
background-color = mkLiteral "transparent";
text-color = fg;
font = with fonts; "${monospace.name} ${toString sizes.popups}";
};
window = {
height = mkLiteral "75%";
width = mkLiteral "75%";
border = mkLiteral "1px";
border-color = border;
border-radius = mkLiteral "5px";
background-color = bg;
};
inputbar = {
children = map mkLiteral [
"prompt"
"entry"
];
padding = mkLiteral "2px";
};
prompt = {
background-color = bg2;
padding = mkLiteral "6px";
text-color = blue;
border-radius = mkLiteral "5px";
margin = mkLiteral "20px 0px 0px 20px";
};
textbox-prompt-colon = {
expand = false;
str = "=";
};
entry = {
padding = mkLiteral "6px";
margin = mkLiteral "20px 0px 0px 10px";
};
listview = {
border = mkLiteral "0px 0px 0px";
padding = mkLiteral "6px 0px 0px";
margin = mkLiteral "10px 0px 0px 20px";
columns = 2;
lines = 5;
};
element = {
padding = mkLiteral "5px";
};
"element-icon" = {
size = mkLiteral "25px";
};
"element selected" = {
background-color = bg2;
text-color = blue;
border-radius = mkLiteral "5px";
};
mode-switcher = {
spacing = 0;
};
button = {
padding = mkLiteral "10px";
text-color = fg2;
border-radius = mkLiteral "5px";
vertical-align = mkLiteral "0.5";
horizontal-align = mkLiteral "0.5";
};
"button selected" = {
background-color = bg2;
text-color = blue;
};
message = {
margin = mkLiteral "2px";
padding = mkLiteral "2px";
border-radius = mkLiteral "5px";
};
textbox = {
padding = mkLiteral "6px";
margin = mkLiteral "20px 0px 0px 20px";
text-color = blue;
};
};
};
}

10
system/home/shell/bat.nix
View file

@ -1,10 +0,0 @@
{ ... }:
{
programs.bat = {
enable = true;
config = {
theme = "OneHalfLight";
style = "plain,numbers,changes";
};
};
}

51
system/home/shell/bottom.nix
View file

@ -1,51 +0,0 @@
{ config, accentColourName, ... }:
{
programs.bottom = {
enable = true;
settings = {
flags = {
group_processes = true;
temperature_type = "celsius";
battery = true;
enable_gpu = true;
enable_cache_memory = true;
};
colors =
let
sc = config.scheme.withHashtag;
rainbow = with sc; [
red
yellow
green
cyan
blue
magenta
];
in
{
table_header_color = sc.base05;
all_cpu_color = sc.base05;
avg_cpu_color = sc.base05;
cpu_core_colors = rainbow;
ram_color = sc.red;
cache_color = sc.green;
swap_color = sc.blue;
rx_color = sc.green;
tx_color = sc.blue;
widget_title_color = sc.${accentColourName};
border_color = sc.base02;
highlighted_border_color = sc.${accentColourName};
text_color = sc.base05;
graph_color = sc.base04;
cursor_color = sc.base02;
selected_text_color = sc.base05;
selected_bg_color = sc.base01;
high_battery_color = sc.green;
medium_battery_color = sc.yellow;
low_battery_color = sc.red;
gpu_core_colors = rainbow;
arc_color = sc.cyan;
};
};
};
}

120
system/home/shell/default.nix
View file

@ -1,17 +1,14 @@
{ pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = [ imports = [
./bat.nix
./bottom.nix
./direnv.nix
./eza.nix
./fastfetch.nix
./fzf.nix
./git.nix ./git.nix
./readline.nix
./ssh.nix ./ssh.nix
./starship.nix ./starship.nix
./zellij.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
rclone rclone
@ -20,10 +17,115 @@
]; ];
programs = { programs = {
bash.enable = true; bash.enable = true;
fastfetch.enable = true;
fish.enable = true; fish.enable = true;
fd.enable = true; fd.enable = true;
jq.enable = true; jq.enable = true;
nix-index.enable = true; nix-index.enable = true;
ripgrep.enable = true; ripgrep.enable = true;
bat = {
enable = true;
config.style = "plain,numbers,changes";
};
bottom = {
enable = true;
settings = {
flags = {
group_processes = true;
temperature_type = "celsius";
battery = true;
enable_gpu = true;
enable_cache_memory = true;
};
colors =
let
rainbow = with config.lib.stylix.scheme.withHashtag; [
red
yellow
green
cyan
blue
magenta
];
in
{
cpu_core_colors = rainbow;
gpu_core_colors = rainbow;
};
};
};
direnv = {
enable = true;
nix-direnv.enable = true;
};
eza = {
enable = true;
git = true;
icons = true;
extraOptions = [ "--octal-permissions" ];
};
fzf = {
enable = true;
defaultCommand = "${pkgs.fd}/bin/fd --type f";
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
};
readline = {
enable = true;
variables = {
bell-style = "visible";
blink-matching-paren = "On";
colored-completion-prefix = "On";
colored-stats = "On";
completion-ignore-case = "On";
completion-map-case = "On";
editing-mode = "emacs";
expand-tilde = "On";
horizontal-scroll-mode = "On";
mark-directories = "On";
mark-symlinked-directories = "On";
visible-stats = "On";
};
};
zellij = {
enable = true;
settings = {
default_mode = "locked";
mouse_mode = true;
copy_command = lib.mkIf config.wayland.windowManager.sway.enable "wl-copy";
copy_on_select = true;
};
};
zsh = {
enable = true;
enableCompletion = true;
autocd = true;
autosuggestion.enable = true;
defaultKeymap = "emacs";
syntaxHighlighting = {
enable = true;
highlighters = [
"brackets"
"cursor"
];
};
historySubstringSearch.enable = true;
history = {
extended = true;
share = true;
ignoreDups = true;
ignoreAllDups = true;
ignoreSpace = true;
expireDuplicatesFirst = true;
};
initExtra = ''
## completion config and styling
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
zstyle ':completion:*' menu 'select=long-list'
## transient prompt
source ${./transient.zsh}
'';
};
}; };
} }

7
system/home/shell/direnv.nix
View file

@ -1,7 +0,0 @@
{ ... }:
{
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
}

9
system/home/shell/eza.nix
View file

@ -1,9 +0,0 @@
{ ... }:
{
programs.eza = {
enable = true;
git = true;
icons = true;
extraOptions = [ "--octal-permissions" ];
};
}

7
system/home/shell/fastfetch.nix
View file

@ -1,7 +0,0 @@
{ ... }:
{
programs.fastfetch = {
enable = true;
settings = { };
};
}

9
system/home/shell/fzf.nix
View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
programs.fzf = {
enable = true;
defaultCommand = "${pkgs.fd}/bin/fd --type f";
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
};
}

20
system/home/shell/readline.nix
View file

@ -1,20 +0,0 @@
{ ... }:
{
programs.readline = {
enable = true;
variables = {
bell-style = "visible";
blink-matching-paren = "On";
colored-completion-prefix = "On";
colored-stats = "On";
completion-ignore-case = "On";
completion-map-case = "On";
editing-mode = "emacs";
expand-tilde = "On";
horizontal-scroll-mode = "On";
mark-directories = "On";
mark-symlinked-directories = "On";
visible-stats = "On";
};
};
}

28
system/home/shell/zellij.nix
View file

@ -1,28 +0,0 @@
{ config, lib, ... }:
{
programs.zellij = {
enable = true;
settings = {
themes.base16 = with config.scheme.withHashtag; rec {
inherit
red
green
yellow
blue
magenta
cyan
orange
;
black = base00;
bg = black;
white = base05;
fg = white;
};
theme = "base16";
default_mode = "locked";
mouse_mode = true;
copy_command = lib.mkIf config.wayland.windowManager.sway.enable "wl-copy";
copy_on_select = true;
};
};
}

34
system/home/shell/zsh.nix
View file

@ -1,34 +0,0 @@
{ ... }:
{
programs.zsh = {
enable = true;
enableCompletion = true;
autocd = true;
autosuggestion.enable = true;
defaultKeymap = "emacs";
syntaxHighlighting = {
enable = true;
highlighters = [
"brackets"
"cursor"
];
};
historySubstringSearch.enable = true;
history = {
extended = true;
share = true;
ignoreDups = true;
ignoreAllDups = true;
ignoreSpace = true;
expireDuplicatesFirst = true;
};
initExtra = ''
## completion config and styling
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
zstyle ':completion:*' menu 'select=long-list'
## transient prompt
source ${./transient.zsh}
'';
};
}

181
system/home/sway/default.nix
View file

@ -2,20 +2,10 @@
config, config,
lib, lib,
pkgs, pkgs,
fonts,
accentColourName,
... ...
}: }:
{ {
imports = [ imports = [ ./waybar/default.nix ];
../avizo/default.nix
../fuzzel/default.nix
../mako/default.nix
../swaylock/default.nix
../swayidle/default.nix
../waybar/default.nix
../wlogout/default.nix
];
home.packages = with pkgs; [ home.packages = with pkgs; [
ffmpeg ffmpeg
grim grim
@ -29,15 +19,88 @@
swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n" swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
'') '')
]; ];
programs.waybar.systemd.target = "sway-session.target"; programs = {
waybar.systemd.target = "sway-session.target";
swaylock.enable = true;
fuzzel = {
enable = true;
settings = {
main = {
icon-theme = config.gtk.iconTheme.name;
icons-enabled = true;
fields = "filename,name,generic,categories";
fuzzy = true;
filter-desktop = true;
terminal = "${config.programs.alacritty.package}/bin/alacritty -e";
lines = 24;
width = 80;
tabs = 4;
layer = "overlay";
};
border = {
width = 1;
radius = 5;
};
};
};
wlogout = {
enable = true;
layout = [
{
label = "reboot";
action = "systemctl reboot";
text = "Reboot";
keybind = "r";
}
{
label = "shutdown";
action = "systemctl poweroff";
text = "Shutdown";
keybind = "s";
}
{
label = "logout";
action = "swaymsg exit";
text = "Logout";
keybind = "l";
}
];
};
};
services = { services = {
kanshi.systemdTarget = "sway-session.target"; kanshi.systemdTarget = "sway-session.target";
gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
avizo.enable = true; avizo = {
enable = true;
settings.default.image-opacity = lib.mkForce "1.0";
};
kdeconnect = { kdeconnect = {
enable = true; enable = true;
indicator = true; indicator = true;
}; };
mako = {
enable = true;
anchor = "top-right";
width = 600;
height = 600;
layer = "top";
markup = true;
maxVisible = 10;
icons = true;
iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
borderRadius = 5;
borderSize = 1;
defaultTimeout = 0;
};
swayidle = {
enable = true;
timeouts = [
{
timeout = 60 * 15; # 15 minutes
command = "swaylock";
}
];
};
udiskie = { udiskie = {
enable = true; enable = true;
notify = true; notify = true;
@ -45,21 +108,13 @@
tray = "never"; tray = "never";
}; };
}; };
gtk = gtk = {
let enable = true;
toCapital = import ../lib/to_capital.nix lib; iconTheme = {
in package = pkgs.papirus-icon-theme.override { color = "violet"; };
{ name = "Papirus-${(import ../lib/to_capital.nix lib) config.lib.stylix.scheme.variant}";
enable = true;
theme = {
package = pkgs.materia-theme;
name = "Materia-${config.scheme.variant}";
};
iconTheme = {
package = pkgs.papirus-icon-theme.override { color = "violet"; };
name = "Papirus-${toCapital config.scheme.variant}";
};
}; };
};
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
package = pkgs.swayfx.overrideAttrs (old: { package = pkgs.swayfx.overrideAttrs (old: {
@ -94,80 +149,10 @@
inner = 5; inner = 5;
outer = 0; outer = 0;
}; };
fonts = {
names = [ fonts.monospace.name ];
style = "regular";
size = fonts.sizes.desktop * 1.0;
};
colors =
let
sc = config.scheme.withHashtag;
text = toString sc.base05;
indicator = toString sc.${accentColourName};
background = toString sc.base00;
in
{
inherit background;
focused =
let
border = toString sc.${accentColourName};
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
focusedInactive =
let
border = toString sc.base04;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
unfocused =
let
border = toString sc.base03;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
urgent =
let
border = toString sc.red;
in
{
inherit
background
text
indicator
border
;
childBorder = border;
};
};
startup = [ startup = [
{ command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; } { command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; }
{ command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n"; } { command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n"; }
{ command = "${pkgs.dex}/bin/dex -a"; } { command = "${pkgs.dex}/bin/dex -a"; }
{
command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${../wallpapers/landscapes/tropic_island_day.jpg}";
}
{ command = "${config.services.mako.package}/bin/mako"; } { command = "${config.services.mako.package}/bin/mako"; }
]; ];
window = { window = {
@ -236,7 +221,7 @@
"XF86MonBrightnessDown" = "exec ${config.services.avizo.package}/bin/lightctl - 5"; "XF86MonBrightnessDown" = "exec ${config.services.avizo.package}/bin/lightctl - 5";
# System utilities # System utilities
"Mod4+Mod1+l" = "exec swaylockfx"; "Mod4+Mod1+l" = "exec swaylock";
"${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore"; "${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore";
"${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a"; "${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a";
"${modifier}+Shift+p" = "exec ${config.programs.wlogout.package}/bin/wlogout"; "${modifier}+Shift+p" = "exec ${config.programs.wlogout.package}/bin/wlogout";

69
system/home/waybar/default.nix → system/home/sway/waybar/default.nix
View file

@ -1,11 +1,6 @@
{ config, pkgs, ... }:
{ {
config, stylix.targets.waybar.enable = false;
pkgs,
fonts,
accentColourName,
...
}:
{
systemd.user.targets.tray.Unit = { systemd.user.targets.tray.Unit = {
Description = "Home Manager System Tray"; Description = "Home Manager System Tray";
Requires = [ "graphical-session.target" ]; Requires = [ "graphical-session.target" ];
@ -189,14 +184,14 @@
on-scroll = 1; on-scroll = 1;
format = format =
let let
sc = config.scheme.withHashtag; scheme = config.lib.stylix.scheme.withHashtag;
in in
{ {
months = "<span color='${sc.red}'><b>{}</b></span>"; months = "<span color='${scheme.red}'><b>{}</b></span>";
weeks = "<span color='${sc.cyan}'><b>W{}</b></span>"; weeks = "<span color='${scheme.cyan}'><b>W{}</b></span>";
weekdays = "<span color='${sc.orange}'><b>{}</b></span>"; weekdays = "<span color='${scheme.orange}'><b>{}</b></span>";
days = "<span color='${sc.base05}'><b>{}</b></span>"; days = "<span color='${scheme.base05}'><b>{}</b></span>";
today = "<span color='${sc.${accentColourName}}'><b><i>{}</i></b></span>"; today = "<span color='${scheme.base0D}'><b><i>{}</i></b></span>";
}; };
}; };
actions = { actions = {
@ -277,14 +272,14 @@
}; };
style = style =
let let
sc = config.scheme.withHashtag; scheme = config.lib.stylix.scheme.withHashtag;
alpha = "0.8"; alpha = "0.8";
in in
'' ''
* { * {
all: unset; all: unset;
font-size: ${toString (fonts.sizes.popups + 2)}px; font-family: ${config.stylix.fonts.monospace.name};
font-family: ${fonts.monospace.name}; font-size: ${toString config.stylix.fonts.sizes.popups}px;
} }
window { window {
@ -294,23 +289,23 @@
} }
window > box { window > box {
color: ${sc.base05}; color: ${scheme.base05};
background: ${sc.base00}; background: ${scheme.base00};
margin: 5px 5px 0px; margin: 5px 5px 0px;
padding: 0px; padding: 0px;
border-top: 1px solid ${sc.base04}; border-top: 1px solid ${scheme.base04};
border-radius: 5px; border-radius: 5px;
} }
tooltip { tooltip {
background: alpha(${sc.base00}, ${alpha}); background: alpha(${scheme.base00}, ${alpha});
border: 1px solid ${sc.${accentColourName}}; border: 1px solid ${scheme.base0D};
border-radius: 5px; border-radius: 5px;
box-shadow: none; box-shadow: none;
} }
tooltip label { tooltip label {
color: ${sc.base05}; color: ${scheme.base05};
border: none; border: none;
padding: 5px; padding: 5px;
margin: 0px; margin: 0px;
@ -338,57 +333,57 @@
#backlight, #backlight,
#battery, #battery,
#custom-weather { #custom-weather {
color: ${sc.base05}; color: ${scheme.base05};
} }
#workspaces button { #workspaces button {
background: transparent; background: transparent;
color: ${sc.base05}; color: ${scheme.base05};
margin: 0px; margin: 0px;
padding: 0px 5px; padding: 0px 5px;
} }
#workspaces button.persistent { #workspaces button.persistent {
color: ${sc.base03}; color: ${scheme.base03};
} }
#workspaces button.focused { #workspaces button.focused {
color: ${sc.${accentColourName}}; color: ${scheme.base0D};
} }
#workspaces button.urgent { #workspaces button.urgent {
color: ${sc.base09}; color: ${scheme.base09};
} }
#mpris { #mpris {
color: ${sc.base04}; color: ${scheme.base04};
} }
#custom-notification { #custom-notification {
color: ${sc.base08}; color: ${scheme.base08};
} }
#pulseaudio { #pulseaudio {
color: ${sc.base09}; color: ${scheme.base09};
} }
#network { #network {
color: ${sc.base0A}; color: ${scheme.base0A};
} }
#bluetooth { #bluetooth {
color: ${sc.base0B}; color: ${scheme.base0B};
} }
#clock.calendar { #clock.calendar {
color: ${sc.base0C}; color: ${scheme.base0C};
} }
#clock { #clock {
color: ${sc.base0D}; color: ${scheme.base0D};
} }
#battery.warning { #battery.warning {
color: ${sc.base09}; color: ${scheme.base09};
} }
#battery.critical { #battery.critical {
color: ${sc.base08}; color: ${scheme.base08};
} }
#battery.charging, #battery.charging,
#battery.plugged { #battery.plugged {
color: ${sc.base0B}; color: ${scheme.base0B};
} }
''; '';
}; };

13
system/home/swayidle/default.nix
View file

@ -1,13 +0,0 @@
{ ... }:
{
imports = [ ../swaylock/default.nix ];
services.swayidle = {
enable = true;
timeouts = [
{
timeout = 60 * 15; # 15 minutes
command = "swaylockfx";
}
];
};
}

52
system/home/swaylock/default.nix
View file

@ -1,52 +0,0 @@
{
config,
pkgs,
accentColourName,
...
}:
{
home.packages = with pkgs; [
(writeShellScriptBin "swaylockfx" ''
${swaylock-effects}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse
'')
];
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
# Settings are specifically for swaylock-effects
settings =
let
sc = config.scheme;
in
{
indicator-radius = 100;
indicator-thickness = 10;
indicator-caps-lock = true;
ignore-empty-password = true;
show-failed-attempts = true;
effect-blur = "5x3";
effect-vignette = "0.5:0.5";
grace = 2;
fade-in = 0.2;
bs-hl-color = sc.base06;
caps-lock-bs-hl-color = sc.base06;
caps-lock-key-hl-color = sc.green;
inside-color = "${sc.base00}cc";
key-hl-color = sc.green;
layout-bg-color = "${sc.base00}cc";
layout-border-color = sc.${accentColourName};
layout-text-color = sc.base05;
ring-color = sc.${accentColourName};
ring-clear-color = sc.base06;
ring-caps-lock-color = sc.base09;
ring-ver-color = sc.blue;
ring-wrong-color = sc.red;
separator-color = sc.base01;
text-color = sc.base05;
text-clear-color = sc.base06;
text-caps-lock-color = sc.base09;
text-ver-color = sc.blue;
text-wrong-color = sc.red;
};
};
}

363
system/home/swaync/default.nix
View file

@ -1,363 +0,0 @@
{
config,
pkgs,
fonts,
accentColourName,
...
}:
{
home.packages = [ pkgs.swaynotificationcenter ];
xdg.configFile."swaync/style.css".text =
let
sc = config.scheme.withHashtag;
alpha = "0.85";
alpha-background = "rgba(${config.scheme.base00-rgb-r}, ${config.scheme.base00-rgb-g}, ${config.scheme.base00-rgb-b}, ${alpha})";
in
''
* {
all: unset;
font-size: 1.2rem;
font-family: "${fonts.monospace.name}";
transition: 200ms;
box-shadow: none;
}
.floating-notifications.background .notification-row .notification-background {
border-radius: 5px;
border: 1px solid ${sc.${accentColourName}};
margin: 18px;
background-color: ${alpha-background};
color: ${sc.base05};
padding: 0;
}
.floating-notifications.background
.notification-row
.notification-background
.notification {
padding: 7px;
border-radius: 5px;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content {
margin: 7px;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content
.summary {
color: ${sc.base05};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content
.time {
color: ${sc.base04};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content
.body {
color: ${sc.base05};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> * {
min-height: 3.4em;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action {
border-radius: 5px;
background-color: ${sc.base01};
color: ${sc.base05};
margin: 7px;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:hover {
background-color: ${sc.base01};
color: ${sc.base05};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:active {
background-color: ${sc.blue};
color: ${sc.base00};
}
.floating-notifications.background
.notification-row
.notification-background
.close-button {
margin: 7px;
padding: 2px;
border-radius: 5px;
background-color: ${sc.red};
color: ${sc.base00};
}
.floating-notifications.background
.notification-row
.notification-background
.close-button:hover {
background-color: ${sc.red};
color: ${sc.base00};
}
.floating-notifications.background
.notification-row
.notification-background
.close-button:active {
background-color: ${sc.red};
color: ${sc.base00};
}
.control-center {
border-radius: 5px;
border: 1px solid ${sc.${accentColourName}};
margin: 18px;
background-color: ${alpha-background};
color: ${sc.base05};
padding: 14px;
}
.control-center .widget-title {
color: ${sc.base05};
font-size: 1.3em;
}
.control-center .widget-title button {
border-radius: 7px;
background-color: ${sc.base01};
color: ${sc.base05};
padding: 8px;
}
.control-center .widget-title button:hover {
background-color: ${sc.base02};
color: ${sc.base05};
}
.control-center .widget-title button:active {
background-color: ${sc.base03};
color: ${sc.base05};
}
.control-center .notification-row .notification-background {
border-radius: 5px;
background-color: ${sc.base01};
color: ${sc.base05};
margin-top: 14px;
}
.control-center .notification-row .notification-background .notification {
padding: 7px;
border-radius: 7px;
}
.control-center
.notification-row
.notification-background
.notification
.notification-content {
margin: 7px;
}
.control-center
.notification-row
.notification-background
.notification
.notification-content
.summary {
color: ${sc.base05};
}
.control-center
.notification-row
.notification-background
.notification
.notification-content
.time {
color: ${sc.base04};
}
.control-center
.notification-row
.notification-background
.notification
.notification-content
.body {
color: ${sc.base05};
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> * {
min-height: 3.4em;
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action {
border-radius: 7px;
background-color: ${sc.base00};
color: ${sc.base05};
margin: 7px;
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:hover {
background-color: ${sc.base01};;
color: ${sc.base05};
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:active {
background-color: ${sc.blue};
color: ${sc.base05};
}
.control-center .notification-row .notification-background .close-button {
margin: 7px;
padding: 2px;
border-radius: 6.3px;
background-color: ${sc.red};
color: ${sc.base00};
}
.control-center .notification-row .notification-background .close-button:hover {
background-color: ${sc.red};
color: ${sc.base00};
}
.control-center
.notification-row
.notification-background
.close-button:active {
background-color: ${sc.red};
color: ${sc.base00};
}
.control-center .notification-row .notification-background:hover {
background-color: ${sc.base00};
color: ${sc.base05};
}
.control-center .notification-row .notification-background:active {
background-color: ${sc.blue};
color: ${sc.base05};
}
progressbar,
progress,
trough {
border-radius: 12.6px;
}
.notification.critical progress {
background-color: ${sc.red};
}
.notification.low progress,
.notification.normal progress {
background-color: ${sc.blue};
}
trough {
background-color: ${sc.base00};
}
.control-center trough {
background-color: ${sc.base03};
}
.control-center-dnd {
margin-top: 5px;
border-radius: 8px;
background: ${sc.base00};
border: 1px solid ${sc.base03};
}
.control-center-dnd:checked {
background: ${sc.base00};
}
.control-center-dnd slider {
background: ${sc.base03};
border-radius: 8px;
}
.widget-dnd {
margin: 0px;
font-size: 1.1rem;
}
.widget-dnd > switch {
font-size: initial;
border-radius: 8px;
background: ${sc.base00};
border: 1px solid ${sc.base03};
}
.widget-dnd > switch:checked {
background: ${sc.base00};
}
.widget-dnd > switch slider {
background: ${sc.base01};
border-radius: 8px;
border: 1px solid ${sc.${accentColourName}};
}
'';
}

61
system/home/wlogout/default.nix
View file

@ -1,61 +0,0 @@
{ config, fonts, ... }:
{
programs.wlogout = {
enable = true;
layout = [
{
label = "reboot";
action = "systemctl reboot";
text = "Reboot";
keybind = "r";
}
{
label = "shutdown";
action = "systemctl poweroff";
text = "Shutdown";
keybind = "s";
}
{
label = "logout";
action = "swaymsg exit";
text = "Logout";
keybind = "l";
}
];
style =
let
sc = config.scheme.withHashtag;
in
''
* {
font-size: ${toString fonts.sizes.popups}px;
font-family: "${fonts.sansSerif.name}";
}
window {
border: none;
background-color: transparent;
}
button {
background-color: ${sc.base00};
background-repeat: no-repeat;
background-position: center;
background-size: 25%;
box-shadow: none;
margin: 5px;
color: ${sc.base05};
}
button:hover {
background-color: ${sc.base01};
color: ${sc.base05};
}
button:focus {
background-color: ${sc.base02};
color: ${sc.base05};
}
'';
};
}

46
system/home/zathura/default.nix
View file

@ -1,39 +1,15 @@
{ config, fonts, ... }: { ... }:
{ {
# TODO add emacs keybinds # TODO add emacs keybinds
programs.zathura = programs.zathura = {
let enable = true;
sc = config.scheme.withHashtag; options = {
in adjust-open = "best-fit";
{ database = "null";
enable = true; dbus-service = true;
options = { sandbox = "normal";
adjust-open = "best-fit"; scroll-page-aware = true;
database = "null"; synctex = true;
dbus-service = true;
sandbox = "normal";
scroll-page-aware = true;
synctex = true;
font = "${fonts.monospace.name} ${toString fonts.sizes.applications}";
# Colour scheme
default-bg = sc.base00;
default-fg = sc.base05;
# completion-bg = "";
# completion-fg = "";
# completion-group-bg = "";
# completion-group-fg = "";
# completion-highlight-bg = "";
# completion-highlight-fg = "";
# inputbar-bg = "";
# inputbar-fg = "";
# notification-bg = "";
# notification-fg = "";
# notification-error-bg = "";
# notification-error-fg = "";
# notification-warning-bg = "";
# notification-warning-fg = "";
# statusbar-bg = "";
# statusbar-fg = "";
};
}; };
};
} }

3
system/laptop.nix
View file

@ -1,7 +1,6 @@
{ pkgs, username, ... }: { pkgs, ... }:
{ {
imports = [ ./desktop.nix ]; imports = [ ./desktop.nix ];
home-manager.users.${username}.imports = [ ./home/laptop.nix ];
environment.systemPackages = [ pkgs.acpi ]; environment.systemPackages = [ pkgs.acpi ];
powerManagement.enable = true; powerManagement.enable = true;
services.auto-cpufreq = { services.auto-cpufreq = {