Compare commits
1 commit
main
...
stylix-fix
| Author | SHA1 | Date | |
|---|---|---|---|
 Lillian Violet
|
e4839e4d2e |
1054
flake.lock
1054
flake.lock
File diff suppressed because it is too large
Load diff
13
flake.nix
13
flake.nix
|
|
@ -34,10 +34,10 @@
|
|||
catppuccin.url = "github:catppuccin/nix";
|
||||
|
||||
# Conduit fork without all the fuss and drama
|
||||
conduwuit = {
|
||||
url = "github:girlbossceo/conduwuit";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# conduwuit = {
|
||||
# url = "github:girlbossceo/conduwuit";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
|
||||
# Nix index database files
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
jovian,
|
||||
nixos-hardware,
|
||||
nix-index-database,
|
||||
conduwuit,
|
||||
# conduwuit,
|
||||
stylix,
|
||||
...
|
||||
} @ inputs: let
|
||||
|
|
@ -129,10 +129,9 @@
|
|||
catppuccin.nixosModules.catppuccin
|
||||
stylix.nixosModules.stylix
|
||||
nix-index-database.nixosModules.nix-index
|
||||
{programs.nix-index-database.comma.enable = true;}
|
||||
{
|
||||
home-manager.sharedModules = [
|
||||
catppuccin.homeModules.catppuccin
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
./home-manager/shared
|
||||
sops-nix.homeManagerModules.sops
|
||||
];
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@
|
|||
fzf
|
||||
nextcloud-client
|
||||
nitrokey-app
|
||||
# protonvpn-gui
|
||||
protonvpn-gui
|
||||
virtualbox
|
||||
#watchmate
|
||||
qbittorrent
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
stylix.targets.firefox.profileNames = ["lillian"];
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
nativeMessagingHosts = [pkgs.firefoxpwa];
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
# catppuccin.enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "Atkinson Monolegible:size=12";
|
||||
};
|
||||
|
||||
mouse = {
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@
|
|||
"qBittorrent"
|
||||
"vlc"
|
||||
"steam"
|
||||
"Thunderbird Daily"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -218,12 +219,12 @@
|
|||
"mediacontrol"."previousmedia" = "Media Previous";
|
||||
"mediacontrol"."stopmedia" = "Media Stop";
|
||||
"org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
|
||||
"org_kde_powerdevil"."Decrease Screen Brightness" = ["Monitor Brightness Down" "Ctrl+Volume Down"];
|
||||
"org_kde_powerdevil"."Decrease Screen Brightness Small" = ["Monitor Brightness Down" "Ctrl+Shift+Volume Down"];
|
||||
"org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
|
||||
"org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
|
||||
"org_kde_powerdevil"."Hibernate" = "Hibernate";
|
||||
"org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up";
|
||||
"org_kde_powerdevil"."Increase Screen Brightness" = ["Monitor Brightness Up" "Ctrl+Volume Up"];
|
||||
"org_kde_powerdevil"."Increase Screen Brightness Small" = ["Shift+Monitor Brightness Up" "Ctrl+Shift+Volume Up"];
|
||||
"org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
|
||||
"org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up";
|
||||
"org_kde_powerdevil"."PowerDown" = "Power Down";
|
||||
"org_kde_powerdevil"."PowerOff" = "Power Off";
|
||||
"org_kde_powerdevil"."Sleep" = "Sleep";
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtwcWXnwOOI8G3NqAMfTeuSuDk9ly5xqwQDH2Iey3u+ lillian@queen
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINl+QRyKBYm+sx0hUiD2u6FBdT7aXsZBGUxm4cb7r24k lillian@GLaDOS
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL279XPFj1nzLDozFclntPh8rOcn3d1B5iJNGds9Ray6 lillian@shodan
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRT5MqPrYUhhD5rJFp0PQbkTRtGcNaCaTxEkZw9RiVT lillian@GLaDOS
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
fzf
|
||||
nextcloud-client
|
||||
nitrokey-app
|
||||
# protonvpn-gui
|
||||
protonvpn-gui
|
||||
sops
|
||||
#watchmate
|
||||
qbittorrent
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxXVL6QAiMLwvUYBtXCbkHEh6ENgaEO/rkZWSPJrjLJ lillian@wheatley
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMrmRjLF2tVkWeV7EOgUiF77Q9t+rBziRAdOPo92pyvF lillian@GLaDOS
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
osConfig,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
|
@ -12,7 +13,6 @@
|
|||
./shell/eza.nix
|
||||
./shell/hyfetch.nix
|
||||
];
|
||||
|
||||
home = {
|
||||
username = "lillian";
|
||||
homeDirectory = "/home/lillian";
|
||||
|
|
@ -21,20 +21,6 @@
|
|||
target = ".ssh/id_ed25519.pub";
|
||||
force = true;
|
||||
};
|
||||
|
||||
packages = with pkgs; [
|
||||
# System tools:
|
||||
vscode-langservers-extracted
|
||||
sops
|
||||
zsh
|
||||
bat
|
||||
btop
|
||||
broot
|
||||
lazygit
|
||||
navi
|
||||
nil
|
||||
gh
|
||||
];
|
||||
};
|
||||
|
||||
catppuccin = {
|
||||
|
|
@ -45,6 +31,20 @@
|
|||
freetube.enable = true;
|
||||
freetube.flavor = "macchiato";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# System tools:
|
||||
vscode-langservers-extracted
|
||||
sops
|
||||
zsh
|
||||
bat
|
||||
btop
|
||||
broot
|
||||
lazygit
|
||||
navi
|
||||
nil
|
||||
gh
|
||||
];
|
||||
programs = {
|
||||
navi.enable = true;
|
||||
yazi = {
|
||||
|
|
@ -54,36 +54,33 @@
|
|||
# };
|
||||
};
|
||||
};
|
||||
# stylix.enable = true;
|
||||
# qt.platformTheme.name = lib.mkForce "kvantum";
|
||||
# qt.style.name = lib.mkForce "kvantum";
|
||||
|
||||
# stylix = {
|
||||
# enable = true;
|
||||
# autoEnable = true;
|
||||
# base16Scheme = {
|
||||
# scheme = "Catppuccin Macchiato";
|
||||
# author = "https://github.com/catppuccin/catppuccin";
|
||||
# base00 = "24273a";
|
||||
# base01 = "1e2030";
|
||||
# base02 = "363a4f";
|
||||
# base03 = "494d64";
|
||||
# base04 = "5b6078";
|
||||
# base05 = "cad3f5";
|
||||
# base06 = "f4dbd6";
|
||||
# base07 = "b7bdf8";
|
||||
# base08 = "ed8796";
|
||||
# base09 = "f5a97f";
|
||||
# base0A = "eed49f";
|
||||
# base0B = "a6da95";
|
||||
# base0C = "8bd5ca";
|
||||
# base0D = "8aadf4";
|
||||
# base0E = "c6a0f6";
|
||||
# base0F = "f0c6c6";
|
||||
# };
|
||||
# image = ./background.jpg;
|
||||
# cursor.package = pkgs.catppuccin-cursors;
|
||||
# cursor.name = "catppuccin-macchiato-mauve-cursors";
|
||||
# cursor.size = 16;
|
||||
# };
|
||||
stylix = {
|
||||
enable = true;
|
||||
autoEnable = true;
|
||||
base16Scheme = {
|
||||
scheme = "Catppuccin Macchiato";
|
||||
author = "https://github.com/catppuccin/catppuccin";
|
||||
base00 = "24273a";
|
||||
base01 = "1e2030";
|
||||
base02 = "363a4f";
|
||||
base03 = "494d64";
|
||||
base04 = "5b6078";
|
||||
base05 = "cad3f5";
|
||||
base06 = "f4dbd6";
|
||||
base07 = "b7bdf8";
|
||||
base08 = "ed8796";
|
||||
base09 = "f5a97f";
|
||||
base0A = "eed49f";
|
||||
base0B = "a6da95";
|
||||
base0C = "8bd5ca";
|
||||
base0D = "8aadf4";
|
||||
base0E = "c6a0f6";
|
||||
base0F = "f0c6c6";
|
||||
};
|
||||
image = ./background.jpg;
|
||||
cursor.package = pkgs.catppuccin-cursors;
|
||||
cursor.name = "catppuccin-macchiato-mauve-cursors";
|
||||
cursor.size = 16;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helix";
|
||||
version = "25.01.1";
|
||||
version = "24.07";
|
||||
|
||||
# This release tarball includes source code for the tree-sitter grammars,
|
||||
# which is not ordinarily part of the repository.
|
||||
|
|
@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
|
|||
stripRoot = false;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "";
|
||||
|
||||
nativeBuildInputs = [git installShellFiles];
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
];
|
||||
};
|
||||
# Extra commands that take more complex forms
|
||||
initContent = ''
|
||||
initExtra = ''
|
||||
eval "$(zoxide init --cmd cd zsh)"
|
||||
tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; }
|
||||
zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; }
|
||||
|
|
|
|||
|
|
@ -106,8 +106,8 @@
|
|||
programs = {
|
||||
# Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently
|
||||
command-not-found.enable = lib.mkForce false;
|
||||
# nix-index.enable = true;
|
||||
# nix-index-database.comma.enable = true;
|
||||
nix-index.enable = true;
|
||||
nix-index-database.comma.enable = true;
|
||||
|
||||
direnv = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -160,8 +160,6 @@
|
|||
"floorp.tabbar.style" = 2;
|
||||
"floorp.browser.user.interface" = 8;
|
||||
"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
|
||||
# Bookmarks = [
|
||||
|
|
|
|||
|
|
@ -85,15 +85,14 @@
|
|||
};
|
||||
hardware.has.amd.gpu = true;
|
||||
};
|
||||
|
||||
boot = {
|
||||
loader.systemd-boot.enable = false;
|
||||
};
|
||||
|
||||
binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
};
|
||||
boot.lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
};
|
||||
|
||||
users.users.lillian.extraGroups = ["gamemode"];
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
fzf
|
||||
matrix-conduit
|
||||
docker
|
||||
docker-compose
|
||||
gitea
|
||||
|
|
@ -85,7 +86,6 @@
|
|||
youtube-dl
|
||||
sqlite
|
||||
rocksdb
|
||||
janus-gateway
|
||||
];
|
||||
services.vpn-ip = {
|
||||
enable = false;
|
||||
|
|
|
|||
|
|
@ -115,12 +115,12 @@
|
|||
|
||||
# Enable fwupd daemon and user space client
|
||||
fwupd.enable = true;
|
||||
# pipewire = {
|
||||
# enable = true;
|
||||
# alsa.enable = true;
|
||||
# alsa.support32Bit = true;
|
||||
# pulse.enable = true;
|
||||
# };
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
|
|
@ -142,11 +142,10 @@
|
|||
decky-loader
|
||||
efitools
|
||||
jq
|
||||
noto-fonts
|
||||
noto-fonts-emoji-blob-bin
|
||||
noto-fonts-emoji
|
||||
# noto-fonts
|
||||
# noto-fonts-emoji-blob-bin
|
||||
# noto-fonts-emoji
|
||||
qjackctl
|
||||
jellyfin-media-player
|
||||
|
||||
#rustdesk
|
||||
sbctl
|
||||
|
|
@ -177,29 +176,6 @@
|
|||
protontricks
|
||||
rare
|
||||
lutris
|
||||
|
||||
(kodi.withPackages (kodiPkgs:
|
||||
with kodiPkgs; [
|
||||
steam-controller
|
||||
invidious
|
||||
youtube
|
||||
netflix
|
||||
upnext
|
||||
sponsorblock
|
||||
sendtokodi
|
||||
jellyfin
|
||||
inputstream-adaptive
|
||||
inputstreamhelper
|
||||
inputstream-ffmpegdirect
|
||||
upnext
|
||||
sponsorblock
|
||||
sendtokodi
|
||||
routing
|
||||
requests-cache
|
||||
requests
|
||||
plugin-cache
|
||||
a4ksubtitles
|
||||
]))
|
||||
];
|
||||
|
||||
jovian = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
|
|
@ -28,19 +27,19 @@
|
|||
}
|
||||
}
|
||||
'';
|
||||
# TODO: replace conduwuit with tuwunnel
|
||||
in {
|
||||
# Configure Conduit itself
|
||||
services.conduit = {
|
||||
services.matrix-conduit = {
|
||||
enable = true;
|
||||
|
||||
# This causes NixOS to use the flake defined in this repository instead of
|
||||
# the build of Conduit built into nixpkgs.
|
||||
package = inputs.conduwuit.packages.${pkgs.system}.default;
|
||||
# package = pkgs.conduwuit;
|
||||
# package = inputs.conduwuit.packages.${pkgs.system}.default;
|
||||
package = pkgs.conduwuit;
|
||||
|
||||
settings.global = {
|
||||
inherit server_name;
|
||||
database_backend = "rocksdb";
|
||||
allow_registration = false;
|
||||
# emergency_password = "testpassword";
|
||||
turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"];
|
||||
|
|
@ -118,7 +117,6 @@ in {
|
|||
locations."=/.well-known/matrix/client" = {
|
||||
# Use the contents of the derivation built previously
|
||||
alias = "${well_known_client}";
|
||||
return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}'";
|
||||
|
||||
extraConfig = ''
|
||||
# Set the header since by default NGINX thinks it's just bytes
|
||||
|
|
@ -132,7 +130,6 @@ in {
|
|||
proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync";
|
||||
proxyWebsockets = true;
|
||||
recommendedProxySettings = false;
|
||||
return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}'";
|
||||
extraConfig = ''
|
||||
proxy_set_header Host $host;
|
||||
proxy_buffering off;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
# ./conduit
|
||||
./conduit
|
||||
./forgejo
|
||||
./gotosocial
|
||||
./mail-server
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
enable = true;
|
||||
hostName = "nextcloud.gladtherescake.eu";
|
||||
|
||||
package = pkgs.nextcloud31;
|
||||
package = pkgs.nextcloud30;
|
||||
|
||||
# Use HTTPS for links
|
||||
https = true;
|
||||
|
|
|
|||
|
|
@ -67,19 +67,6 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
|
||||
#TODO: ugly hardcoded delete, if it ever becomes a problem fix this, else just leave it I guess
|
||||
system.userActivationScripts = {
|
||||
removeConflictingFiles = {
|
||||
text = ''
|
||||
rm -f /home/lillian/.config/gtk-3.0/settings.ini.backup
|
||||
rm -f /home/lillian/.config/gtk-3.0/gtk.css.backup
|
||||
rm -f /home/lillian/.config/gtk-4.0/settings.ini.backup
|
||||
rm -f /home/lillian/.config/gtk-4.0/gtk.css.backup
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
catppuccin = {
|
||||
flavor = "macchiato";
|
||||
tty.enable = true;
|
||||
|
|
@ -102,7 +89,6 @@
|
|||
|
||||
stylix = {
|
||||
enable = true;
|
||||
# targets.qt.platform = "kde6";
|
||||
autoEnable = true;
|
||||
base16Scheme = {
|
||||
scheme = "Catppuccin Macchiato";
|
||||
|
|
@ -127,7 +113,7 @@
|
|||
image = ./background.jpg;
|
||||
cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
|
||||
cursor.name = "catppuccin-macchiato-mauve-cursors";
|
||||
cursor.size = 24;
|
||||
cursor.size = 16;
|
||||
homeManagerIntegration.followSystem = true;
|
||||
fonts = {
|
||||
serif = {
|
||||
|
|
@ -155,6 +141,7 @@
|
|||
fonts.packages = [
|
||||
pkgs.atkinson-hyperlegible
|
||||
pkgs.atkinson-monolegible
|
||||
pkgs.noto-fonts-emoji-blob-bin
|
||||
pkgs.noto-fonts
|
||||
pkgs.nerd-fonts.fira-mono
|
||||
];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
install-nix-no-inhibit
|
||||
update
|
||||
upgrade
|
||||
simple-completion-language-server
|
||||
# simple-completion-language-server
|
||||
|
||||
# System tools
|
||||
age
|
||||
|
|
|
|||
|
|
@ -5,17 +5,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "simple-completion-language-server";
|
||||
version = "6c797949ad5a6e9548b60b5475d1c9977f26c811";
|
||||
version = "ff9f90bc96c347f284571bc6310bc31f95508d55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "estin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM=";
|
||||
hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM=";
|
||||
cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo=";
|
||||
meta = with lib; {
|
||||
description = "Language server to enable word completion and snippets for Helix editor";
|
||||
homepage = "https://github.com/estin/simple-completion-language-server";
|
||||
|
|
|
|||
Loading…
Reference in a new issue