sorceress
/
nix-infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sorceress:5fc359128c45ec69d20c12b5d5588fd378ac317a
Branches Tags
sorceress:mistress
sorceress:lappytappy
sorceress:flakes
...
compare: sorceress:e08b57898a9697e3a0f195daeb3f813c33bb77b4
Branches Tags
sorceress:mistress
sorceress:lappytappy
sorceress:flakes

4 Commits
5fc359128c ... e08b57898a

Author SHA1 Message Date
Agatha Lovelace e08b57898a
Visual tweaks 2023-10-25 13:34:55 +02:00
Agatha Lovelace a9f551821f
Fix lockscreen 2023-10-22 16:07:34 +02:00
Agatha Lovelace c9a4e46f04
Paramount theme for pastebin 2023-10-22 13:15:24 +02:00
Agatha Lovelace 61c970c0bf
Enable syncthing on all graphical devices 2023-10-22 13:14:41 +02:00
13 changed files with 309 additions and 29 deletions
Show Stats Expand all files Collapse all files

1
common/fragments/graphical/bspwm.nix
View File

@ -48,7 +48,6 @@
follow = true; follow = true;
}; };
"Yubico Authenticator".state = "floating"; "Yubico Authenticator".state = "floating";
"firefox:Places".state = "floating";
}; };
}; };

8
common/fragments/graphical/default.nix
View File

@ -12,6 +12,7 @@
./polybar.nix ./polybar.nix
./rofi.nix ./rofi.nix
./spotify.nix ./spotify.nix
./syncthing.nix
./theme.nix ./theme.nix
./url-eater.nix ./url-eater.nix
]; ];
@ -35,6 +36,7 @@
bspm bspm
clipmenu clipmenu
colmena colmena
darktable
element-desktop element-desktop
ffmpeg ffmpeg
flameshot flameshot
@ -49,7 +51,6 @@
gnome.nautilus gnome.nautilus
gnome.totem gnome.totem
hyperfine hyperfine
lxappearance
magic-wormhole magic-wormhole
neofetch neofetch
nil nil
@ -135,6 +136,11 @@
<Multi_key> <m><s> : "/html <span data-mx-spoiler=\"\"></span>" <Multi_key> <m><s> : "/html <span data-mx-spoiler=\"\"></span>"
''; '';
# Fix for apps that expect fonts in the usual location
home.file.".local/share/fonts".source =
config.home-manager.users.agatha.lib.file.mkOutOfStoreSymlink
"/run/current-system/sw/share/X11/fonts";
programs.direnv.enable = true; programs.direnv.enable = true;
home.sessionVariables = { "DIRENV_LOG_FORMAT" = ""; }; home.sessionVariables = { "DIRENV_LOG_FORMAT" = ""; };

3
common/fragments/graphical/dunst.nix
View File

@ -1,4 +1,4 @@
{ lib, pkgs, config, ... }: { pkgs, config, ... }:
let let
color = n: color = n:
config.environment.graphical.colors."${config.environment.graphical.theme.name}"."${builtins.toString config.environment.graphical.colors."${config.environment.graphical.theme.name}"."${builtins.toString
@ -95,6 +95,7 @@ in {
foreground = color 15; foreground = color 15;
frame_color = color 3; frame_color = color 3;
fullscreen = "show";
timeout = 0; timeout = 0;
}; };
# Horrible hack to fix alphabetical sorting overriding this # Horrible hack to fix alphabetical sorting overriding this

10
common/fragments/graphical/lockscreen.nix
View File

@ -3,6 +3,7 @@
# Lockscreen # Lockscreen
services.betterlockscreen = { services.betterlockscreen = {
enable = true; enable = true;
package = pkgs.unstable.betterlockscreen;
arguments = [ "dimblur" ]; arguments = [ "dimblur" ];
}; };
@ -17,14 +18,7 @@
# Send a notification 10 seconds before locking # Send a notification 10 seconds before locking
services.screen-locker.xautolock.extraOptions = [ services.screen-locker.xautolock.extraOptions = [
"-notify 10" "-notify 10"
"-notifier '${pkgs.xscreensaver}/bin/xscreensaver-command --activate'" "-notifier '${pkgs.dunst}/bin/dunstify -t 10000 -u 2 \"Screen will lock in 10 seconds\"'"
]; ];
services.xscreensaver = {
enable = true;
settings = {
dpmsEnabled = "False";
mode = "off";
};
};
}; };
} }

9
common/fragments/graphical/picom.nix
View File

@ -1,4 +1,4 @@
{ pkgs, config, lib, ... }: { { pkgs, ... }: {
home-manager.users.agatha = { home-manager.users.agatha = {
services.picom = { services.picom = {
enable = true; enable = true;
@ -43,6 +43,8 @@
"class_g = 'firefox-nightly' && argb" "class_g = 'firefox-nightly' && argb"
"class_g = 'firefox' && argb" "class_g = 'firefox' && argb"
"_GTK_FRAME_EXTENTS@:c" "_GTK_FRAME_EXTENTS@:c"
"_NET_FRAME_EXTENTS@:c && WM_WINDOW_ROLE@:s = 'Popup'"
"override_redirect = true"
]; ];
# Fade # Fade
@ -79,9 +81,14 @@
background-exclude = [ background-exclude = [
"window_type = 'dock'" "window_type = 'dock'"
"window_type = 'desktop'" "window_type = 'desktop'"
"window_type = 'dropdown_menu'"
"window_type = 'popup_menu'"
"window_type = 'tooltip'"
"_GTK_FRAME_EXTENTS@:c" "_GTK_FRAME_EXTENTS@:c"
"_NET_FRAME_EXTENTS@:c && WM_WINDOW_ROLE@:s = 'Popup'"
"class_g = 'firefox-nightly' && argb" "class_g = 'firefox-nightly' && argb"
"class_g = 'firefox' && argb" "class_g = 'firefox' && argb"
"override_redirect = true"
]; ];
}; };
}; };

2
common/fragments/graphical/spotify.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { { pkgs, ... }: {
programs.spicetify = with pkgs.spicetify-pkgs; { programs.spicetify = with pkgs.spicetify-pkgs; {
enable = true; enable = true;

10
common/fragments/graphical/theme.nix
View File

@ -36,8 +36,8 @@
recursive = true; recursive = true;
source = pkgs.fetchgit { source = pkgs.fetchgit {
url = "https://github.com/ZorinOS/zorin-desktop-themes.git"; url = "https://github.com/ZorinOS/zorin-desktop-themes.git";
rev = "6708d5148545c6d9a99712f63b5efe5a5c0eb2d9"; rev = "4edec9606ee60d40d6cebae9a5cf5ca52a9b694c";
sha256 = "sha256-3KEPP39dCr0ZjyqbAb/isoGdeiySDTvHL9k4oxcw19M="; sha256 = "sha256-onsQeEuideN8dikcVNnq8v22ccln6I2hXP3jFPg8Hr0=";
sparseCheckout = [ "ZorinPurple-Dark" "ZorinPurple-Light" ]; sparseCheckout = [ "ZorinPurple-Dark" "ZorinPurple-Light" ];
}; };
}; };
@ -52,6 +52,12 @@
"ZorinPurple-Dark"; "ZorinPurple-Dark";
}; };
dconf.settings."org/gnome/desktop/interface".color-scheme =
if config.environment.graphical.theme.light then
"prefer-light"
else
"prefer-dark";
programs.helix.settings.theme = programs.helix.settings.theme =
if config.environment.graphical.theme.light then if config.environment.graphical.theme.light then
"paramount-light" "paramount-light"

16
common/pkgs/bin.nix
View File

@ -11,6 +11,22 @@ pkgs.rustPlatform.buildRustPackage rec {
sha256 = "sha256-c5iuk1T3x17iEbLAno716pkQkRtVsB0UJzgIrR64Uec="; sha256 = "sha256-c5iuk1T3x17iEbLAno716pkQkRtVsB0UJzgIrR64Uec=";
}; };
# Use custom syntax highlighting theme
preBuild = ''
cp ${
../../external/paramount-dark.tmTheme
} resources/themes/paramount-dark.tmTheme
substituteInPlace src/models/pretty.rs \
--replace "ayu_dark.tmTheme" "paramount-dark.tmTheme" \
substituteInPlace static/css/index.css static/css/pretty.css templates/* \
--replace "#0f1419" "#000000" \
--replace "#f29718" "#a790d5" \
--replace "#F29718" "#a790d5" \
--replace "#be7611" "#8673aa"
'';
cargoLock = { lockFile = "${src}/Cargo.lock"; }; cargoLock = { lockFile = "${src}/Cargo.lock"; };
nativeBuildInputs = [ pkgs.git ]; nativeBuildInputs = [ pkgs.git ];

247
external/paramount-dark.tmTheme vendored Normal file
View File

@ -0,0 +1,247 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!-- Color Theme paramount-dark, created by Oskar Wickström .
Created with ThemeCreator, https://github.com/mswift42/themecreator -->
<plist version="1.0">
<dict>
<key>author</key>
<string> Oskar Wickström</string>
<key>name</key>
<string>paramount-dark</string>
<key>settings</key>
<array>
<dict>
<key>settings</key>
<dict>
<key>background</key>
<string>#000000</string>
<key>caret</key>
<string>#292929</string>
<key>foreground</key>
<string>#C6C6C6</string>
<key>invisibles</key>
<string>#292929</string>
<key>lineHighlight</key>
<string>#141414</string>
<key>selection</key>
<string>#292929</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Comment</string>
<key>scope</key>
<string>comment</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#4E4E4E</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Foreground</string>
<key>scope</key>
<string>keyword.operator.class, constant.other, source.php.embedded.line</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#a6a6a6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Variable, String Link, Regular Expression, Tag Name, GitGutter deleted</string>
<key>scope</key>
<string>variable, support.other.variable, string.other.link, string.regexp, entity.name.tag, entity.other.attribute-name, meta.tag, declaration.tag, markup.deleted.git_gutter</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#C6C6C6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Number, Constant, Function Argument, Tag Attribute, Embedded</string>
<key>scope</key>
<string>constant.numeric, constant.language, support.constant, constant.character, variable.parameter, punctuation.section.embedded, keyword.other.unit</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#a790d5</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Class, Support</string>
<key>scope</key>
<string>entity.name.class, entity.name.type.class, support.type, support.class</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#C6C6C6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>String, Symbols, Inherited Class, Markup Heading, GitGutter inserted</string>
<key>scope</key>
<string>string, constant.other.symbol, entity.other.inherited-class, entity.name.filename, markup.heading, markup.inserted.git_gutter</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#a790d5</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Operator, Misc</string>
<key>scope</key>
<string>keyword.operator, constant.other.color</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#767676</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Function, Special Method, Block Level, GitGutter changed</string>
<key>scope</key>
<string>entity.name.function, meta.function-call, support.function, keyword.other.special-method, meta.block-level, markup.changed.git_gutter</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#C6C6C6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Keyword, Storage</string>
<key>scope</key>
<string>keyword, storage, storage.type</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>bold</string>
<key>foreground</key>
<string>#767676</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Invalid</string>
<key>scope</key>
<string>invalid</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#E32791</string>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#C6C6C6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Separator</string>
<key>scope</key>
<string>meta.separator</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#C6C6C6</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Deprecated</string>
<key>scope</key>
<string>invalid.deprecated</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#a790d5</string>
<key>fontStyle</key>
<string></string>
<key>foreground</key>
<string>#000000</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Diff foreground</string>
<key>scope</key>
<string>markup.inserted.diff, markup.deleted.diff, meta.diff.header.to-file, meta.diff.header.from-file</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#fafafa</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Diff insertion</string>
<key>scope</key>
<string>markup.inserted.diff, meta.diff.header.to-file</string>
<key>settings</key>
<dict>
<key>background</key>
<string>#123d0f</string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Diff deletion</string>
<key>scope</key>
<string>markup.deleted.diff, meta.diff.header.from-file</string>
<key>settings</key>
<dict>
<key>background</key>
<string></string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Diff header</string>
<key>scope</key>
<string>meta.diff.header.from-file, meta.diff.header.to-file</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string></string>
<key>background</key>
<string></string>
</dict>
</dict>
<dict>
<key>name</key>
<string>Diff range</string>
<key>scope</key>
<string>meta.diff.range</string>
<key>settings</key>
<dict>
<key>fontStyle</key>
<string>italic</string>
<key>foreground</key>
<string>#767676</string>
</dict>
</dict>
</array>
<key>uuid</key>
<string></string>
<key>colorSpaceName</key>
<string>sRGB</string>
</dict>
</plist>

24
flake.lock
View File

@ -53,11 +53,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1696354652, "lastModified": 1696800008,
"narHash": "sha256-Axbr9jIerxTsLhONYmSRbtA+W1+D4j8PcYYtidyNVEc=", "narHash": "sha256-dQ2Xf1K5qH18J7h3pzx4ffp6n1nwN+2L8jv6OBXPLzQ=",
"owner": "AgathaSorceress", "owner": "AgathaSorceress",
"repo": "colorpickle", "repo": "colorpickle",
"rev": "4612d3de1692c98e79e2de848c5776b412377bd1", "rev": "a1a21aebbc9b9716136ab9cc6f77bf5346f8e7ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1696295907, "lastModified": 1697893116,
"narHash": "sha256-GFeo5NpbFQjVeu2lv/B/pfZY/+SIt0KRHjh26s0bXAY=", "narHash": "sha256-KVA6ybNgqVpM4JEkvJE5ujucqvAUCsQGdxZYIasRp/8=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b", "rev": "31f50bf5bf0d49af7359533e0865e878184c5225",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,11 +465,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1696261572, "lastModified": 1697915759,
"narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=", "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb", "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1696039360, "lastModified": 1697777081,
"narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View File

@ -95,7 +95,7 @@
network = { network = {
description = "Agatha's Nix Infra"; description = "Agatha's Nix Infra";
nixpkgs = import nixpkgs { nixpkgs = import nixpkgs rec {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
(final: prev: { (final: prev: {
@ -114,6 +114,9 @@
spicetify-pkgs = spicetify-nix.packages.${final.system}.default; spicetify-pkgs = spicetify-nix.packages.${final.system}.default;
matrix-ril100 = matrix-ril100.packages.${final.system}.default; matrix-ril100 = matrix-ril100.packages.${final.system}.default;
ccase = ccase.packages.${final.system}.default; ccase = ccase.packages.${final.system}.default;
# Unstable packages
unstable = import nixpkgs-unstable { inherit system; };
}) })
colmena.overlay colmena.overlay
]; ];

2
hosts/ritual/configuration.nix
View File

@ -66,6 +66,8 @@
environment.graphical.theme.name = "dark"; environment.graphical.theme.name = "dark";
services.syncthing.dataDir = "/home/agatha/syncthing";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave

1
hosts/tears/configuration.nix
View File

@ -2,7 +2,6 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../common/fragments/graphical ../../common/fragments/graphical
../../common/fragments/graphical/syncthing.nix
../../common/fragments/yubikey.nix ../../common/fragments/yubikey.nix
../../common/home_manager/common.nix ../../common/home_manager/common.nix
]; ];