Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Lillian-Violet:main
Branches Tags
Lillian-Violet:main
Lillian-Violet:stylix-fixed
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0
..
compare: Lillian-Violet:stylix-fixed
Branches Tags
Lillian-Violet:main
Lillian-Violet:stylix-fixed
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0

1 commit
main ... stylix-fix

Author SHA1 Message Date
Lillian Violet e4839e4d2e all the work to make stylix work again, just need to update the flake lock when it's time 2025-04-01 17:26:15 +02:00
12 changed files with 283 additions and 958 deletions
Show stats Expand all files Collapse all files

978
flake.lock
View file

File diff suppressed because it is too large Load diff

12
flake.nix
View file

@ -34,10 +34,10 @@
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
# Conduit fork without all the fuss and drama # Conduit fork without all the fuss and drama
conduwuit = { # conduwuit = {
url = "github:girlbossceo/conduwuit"; # url = "github:girlbossceo/conduwuit";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; # };
# Nix index database files # Nix index database files
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
@ -99,7 +99,7 @@
jovian, jovian,
nixos-hardware, nixos-hardware,
nix-index-database, nix-index-database,
conduwuit, # conduwuit,
stylix, stylix,
... ...
} @ inputs: let } @ inputs: let
@ -131,7 +131,7 @@
nix-index-database.nixosModules.nix-index nix-index-database.nixosModules.nix-index
{ {
home-manager.sharedModules = [ home-manager.sharedModules = [
catppuccin.homeModules.catppuccin inputs.catppuccin.homeModules.catppuccin
./home-manager/shared ./home-manager/shared
sops-nix.homeManagerModules.sops sops-nix.homeManagerModules.sops
]; ];

1
home-manager/desktop/package-configs/foot/default.nix
View file

@ -4,6 +4,7 @@
# catppuccin.enable = true; # catppuccin.enable = true;
settings = { settings = {
main = { main = {
font = "Atkinson Monolegible:size=12";
}; };
mouse = { mouse = {

55
home-manager/desktop/package-configs/plasma-desktop.nix
View file

@ -13,33 +13,33 @@
programs.plasma = { programs.plasma = {
enable = true; enable = true;
desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; desktop.mouseActions.verticalScroll = "switchVirtualDesktop";
# kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
# fonts = { fonts = {
# fixedWidth = { fixedWidth = {
# pointSize = 11; pointSize = 11;
# family = "${osConfig.stylix.fonts.monospace.name}"; family = "${osConfig.stylix.fonts.monospace.name}";
# }; };
# general = { general = {
# pointSize = 11; pointSize = 11;
# family = "${osConfig.stylix.fonts.serif.name}"; family = "${osConfig.stylix.fonts.serif.name}";
# }; };
# menu = { menu = {
# pointSize = 11; pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}"; family = "${osConfig.stylix.fonts.sansSerif.name}";
# }; };
# small = { small = {
# pointSize = 11; pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}"; family = "${osConfig.stylix.fonts.sansSerif.name}";
# }; };
# toolbar = { toolbar = {
# pointSize = 11; pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}"; family = "${osConfig.stylix.fonts.sansSerif.name}";
# }; };
# windowTitle = { windowTitle = {
# pointSize = 11; pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}"; family = "${osConfig.stylix.fonts.sansSerif.name}";
# }; };
# }; };
panels = [ panels = [
{ {
alignment = "left"; alignment = "left";
@ -82,6 +82,7 @@
"qBittorrent" "qBittorrent"
"vlc" "vlc"
"steam" "steam"
"Thunderbird Daily"
]; ];
}; };
} }

59
home-manager/shared/default.nix
View file

@ -54,36 +54,33 @@
# }; # };
}; };
}; };
# stylix.enable = true;
# qt.platformTheme.name = lib.mkForce "kvantum";
# qt.style.name = lib.mkForce "kvantum";
# stylix = { stylix = {
# enable = true; enable = true;
# autoEnable = true; autoEnable = true;
# base16Scheme = { base16Scheme = {
# scheme = "Catppuccin Macchiato"; scheme = "Catppuccin Macchiato";
# author = "https://github.com/catppuccin/catppuccin"; author = "https://github.com/catppuccin/catppuccin";
# base00 = "24273a"; base00 = "24273a";
# base01 = "1e2030"; base01 = "1e2030";
# base02 = "363a4f"; base02 = "363a4f";
# base03 = "494d64"; base03 = "494d64";
# base04 = "5b6078"; base04 = "5b6078";
# base05 = "cad3f5"; base05 = "cad3f5";
# base06 = "f4dbd6"; base06 = "f4dbd6";
# base07 = "b7bdf8"; base07 = "b7bdf8";
# base08 = "ed8796"; base08 = "ed8796";
# base09 = "f5a97f"; base09 = "f5a97f";
# base0A = "eed49f"; base0A = "eed49f";
# base0B = "a6da95"; base0B = "a6da95";
# base0C = "8bd5ca"; base0C = "8bd5ca";
# base0D = "8aadf4"; base0D = "8aadf4";
# base0E = "c6a0f6"; base0E = "c6a0f6";
# base0F = "f0c6c6"; base0F = "f0c6c6";
# }; };
# image = ./background.jpg; image = ./background.jpg;
# cursor.package = pkgs.catppuccin-cursors; cursor.package = pkgs.catppuccin-cursors;
# cursor.name = "catppuccin-macchiato-mauve-cursors"; cursor.name = "catppuccin-macchiato-mauve-cursors";
# cursor.size = 16; cursor.size = 16;
# }; };
} }

3
home-manager/shared/shell/helix/helix.nix
View file

@ -7,7 +7,7 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "helix"; pname = "helix";
version = "25.01.1"; version = "24.07";
# This release tarball includes source code for the tree-sitter grammars, # This release tarball includes source code for the tree-sitter grammars,
# which is not ordinarily part of the repository. # which is not ordinarily part of the repository.
@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
stripRoot = false; stripRoot = false;
}; };
useFetchCargoVendor = true;
cargoHash = ""; cargoHash = "";
nativeBuildInputs = [git installShellFiles]; nativeBuildInputs = [git installShellFiles];

2
nixos/desktop/package-configs/firefox/default.nix
View file

@ -160,8 +160,6 @@
"floorp.tabbar.style" = 2; "floorp.tabbar.style" = 2;
"floorp.browser.user.interface" = 8; "floorp.browser.user.interface" = 8;
"signon.rememberSignons" = true; "signon.rememberSignons" = true;
"browser.ml.chat.enabled" = false;
"browser.ml.chat.shortcuts" = false;
}; };
# TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks
# Bookmarks = [ # Bookmarks = [

10
nixos/server/package-configs/conduit/default.nix
View file

@ -1,6 +1,5 @@
{ {
config, config,
inputs,
pkgs, pkgs,
... ...
}: let }: let
@ -30,16 +29,17 @@
''; '';
in { in {
# Configure Conduit itself # Configure Conduit itself
services.conduwuit = { services.matrix-conduit = {
enable = true; enable = true;
# This causes NixOS to use the flake defined in this repository instead of # This causes NixOS to use the flake defined in this repository instead of
# the build of Conduit built into nixpkgs. # the build of Conduit built into nixpkgs.
package = inputs.conduwuit.packages.${pkgs.system}.default; # package = inputs.conduwuit.packages.${pkgs.system}.default;
# package = pkgs.conduwuit; package = pkgs.conduwuit;
settings.global = { settings.global = {
inherit server_name; inherit server_name;
database_backend = "rocksdb";
allow_registration = false; allow_registration = false;
# emergency_password = "testpassword"; # emergency_password = "testpassword";
turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"]; turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"];
@ -117,7 +117,6 @@ in {
locations."=/.well-known/matrix/client" = { locations."=/.well-known/matrix/client" = {
# Use the contents of the derivation built previously # Use the contents of the derivation built previously
alias = "${well_known_client}"; alias = "${well_known_client}";
return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}'";
extraConfig = '' extraConfig = ''
# Set the header since by default NGINX thinks it's just bytes # Set the header since by default NGINX thinks it's just bytes
@ -131,7 +130,6 @@ in {
proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync";
proxyWebsockets = true; proxyWebsockets = true;
recommendedProxySettings = false; recommendedProxySettings = false;
return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}'";
extraConfig = '' extraConfig = ''
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_buffering off; proxy_buffering off;

2
nixos/server/package-configs/nextcloud/default.nix
View file

@ -50,7 +50,7 @@
enable = true; enable = true;
hostName = "nextcloud.gladtherescake.eu"; hostName = "nextcloud.gladtherescake.eu";
package = pkgs.nextcloud31; package = pkgs.nextcloud30;
# Use HTTPS for links # Use HTTPS for links
https = true; https = true;

110
nixos/shared/default.nix
View file

@ -70,8 +70,8 @@
catppuccin = { catppuccin = {
flavor = "macchiato"; flavor = "macchiato";
tty.enable = true; tty.enable = true;
# sddm.enable = true; sddm.enable = true;
# sddm.flavor = "macchiato"; sddm.flavor = "macchiato";
forgejo.enable = true; forgejo.enable = true;
forgejo.flavor = "macchiato"; forgejo.flavor = "macchiato";
# plymouth.enable = false; # plymouth.enable = false;
@ -87,70 +87,70 @@
enableBrowserSocket = true; enableBrowserSocket = true;
}; };
# stylix = { stylix = {
# enable = true; enable = true;
# # targets.qt.platform = "kde6"; autoEnable = true;
# autoEnable = true; base16Scheme = {
# base16Scheme = { scheme = "Catppuccin Macchiato";
# scheme = "Catppuccin Macchiato"; author = "https://github.com/catppuccin/catppuccin";
# author = "https://github.com/catppuccin/catppuccin"; base00 = "24273a";
# base00 = "24273a"; base01 = "1e2030";
# base01 = "1e2030"; base02 = "363a4f";
# base02 = "363a4f"; base03 = "494d64";
# base03 = "494d64"; base04 = "5b6078";
# base04 = "5b6078"; base05 = "cad3f5";
# base05 = "cad3f5"; base06 = "f4dbd6";
# base06 = "f4dbd6"; base07 = "b7bdf8";
# base07 = "b7bdf8"; base08 = "ed8796";
# base08 = "ed8796"; base09 = "f5a97f";
# base09 = "f5a97f"; base0A = "eed49f";
# base0A = "eed49f"; base0B = "a6da95";
# base0B = "a6da95"; base0C = "8bd5ca";
# base0C = "8bd5ca"; base0D = "8aadf4";
# base0D = "8aadf4"; base0E = "c6a0f6";
# base0E = "c6a0f6"; base0F = "f0c6c6";
# base0F = "f0c6c6"; };
# }; image = ./background.jpg;
# image = ./background.jpg; cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
# cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; cursor.name = "catppuccin-macchiato-mauve-cursors";
# cursor.name = "catppuccin-macchiato-mauve-cursors"; cursor.size = 16;
# cursor.size = 16; homeManagerIntegration.followSystem = true;
# homeManagerIntegration.followSystem = true; fonts = {
# fonts = { serif = {
# serif = { package = pkgs.atkinson-hyperlegible;
# package = pkgs.dejavu_fonts; name = "Atkinson Hyperlegible";
# name = "DejaVu Serif"; };
# };
# monospace = { monospace = {
# package = pkgs.dejavu_fonts; package = pkgs.atkinson-monolegible;
# name = "DejaVu Sans Mono"; name = "Atkinson Monolegible";
# }; };
# sansSerif = { sansSerif = {
# package = pkgs.dejavu_fonts; package = pkgs.atkinson-hyperlegible;
# name = "DejaVu Sans"; name = "Atkinson Hyperlegible";
# }; };
# emoji = { emoji = {
# package = pkgs.noto-fonts-emoji-blob-bin; package = pkgs.noto-fonts-emoji-blob-bin;
# name = "Blobmoji"; name = "Blobmoji";
# }; };
# }; };
# }; };
fonts.packages = [ fonts.packages = [
pkgs.atkinson-hyperlegible pkgs.atkinson-hyperlegible
pkgs.atkinson-monolegible pkgs.atkinson-monolegible
pkgs.noto-fonts-emoji-blob-bin
pkgs.noto-fonts pkgs.noto-fonts
pkgs.nerd-fonts.fira-mono pkgs.nerd-fonts.fira-mono
]; ];
fonts.fontconfig.defaultFonts = { # fonts.fontconfig.defaultFonts = {
emoji = ["Blobmoji"]; # emoji = ["Blobmoji"];
monospace = ["Atkinson Monolegible"]; # monospace = ["Atkinson Monolegible"];
sansSerif = ["Atkinson Hyperlegible"]; # sansSerif = ["Atkinson Hyperlegible"];
}; # };
networking = networking =
if config.services.vpn-ip.enable if config.services.vpn-ip.enable

2
nixos/shared/packages/default.nix
View file

@ -22,7 +22,7 @@
install-nix-no-inhibit install-nix-no-inhibit
update update
upgrade upgrade
simple-completion-language-server # simple-completion-language-server
# System tools # System tools
age age

7
pkgs/simple-completion-language-server/default.nix
View file

@ -5,17 +5,16 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "simple-completion-language-server"; pname = "simple-completion-language-server";
version = "6c797949ad5a6e9548b60b5475d1c9977f26c811"; version = "ff9f90bc96c347f284571bc6310bc31f95508d55";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "estin"; owner = "estin";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM="; hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM=";
}; };
useFetchCargoVendor = true; cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo=";
cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM=";
meta = with lib; { meta = with lib; {
description = "Language server to enable word completion and snippets for Helix editor"; description = "Language server to enable word completion and snippets for Helix editor";
homepage = "https://github.com/estin/simple-completion-language-server"; homepage = "https://github.com/estin/simple-completion-language-server";