amadaluzia/alqueva
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

meta: add at least 24 commits into one

Browse source
This commit is contained in:
Artur Manuel 2025-03-22 17:36:40 +00:00
commit 6420ebef60
Signed by: amadaluzia
SSH key fingerprint: SHA256:Zwg7gBuZyaG48ucAZneJwltiXu0+tJb7c3lYt9AYlLg
25 changed files with 363 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

123
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": ["nixpkgs"] "nixpkgs": ["nixpkgs"]
}, },
"locked": { "locked": {
"lastModified": 1740578800, "lastModified": 1742343598,
"narHash": "sha256-WBAdFAee2LbGsAK7EYSATXNm0Dxthm48KwE7WLGzc4E=", "narHash": "sha256-8m9VIVrX6T3C5iUgDMmfOl3MGI7pQ+OpF9NutaY/a2Q=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ed5ab6c568033780999e2bd2cc353f502236053a", "rev": "f9d95a8775db797a6aa4f754bd7357ce1281eaf6",
"revCount": 5, "revCount": 6,
"type": "git", "type": "git",
"url": "https://codeberg.org/amadaluzia/alqages.git" "url": "https://codeberg.org/amadaluzia/alqages.git"
}, },
@ -47,11 +47,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1740937018, "lastModified": 1742647741,
"narHash": "sha256-R4/+Vr4LpQWHwzZoM0fTyKKC1mGNF/NVHzIe6PqkJsY=", "narHash": "sha256-hli9R2OONaRpyV5teQk+g73oBNQXFbKAZTHVY+AhKDI=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "4ab66e175e54084ca831e2eb3e24fbb048f9cff0", "rev": "f44e30fb15f34b57b741124448e959b2cae38eb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,11 +66,11 @@
"nixpkgs": ["nixpkgs"] "nixpkgs": ["nixpkgs"]
}, },
"locked": { "locked": {
"lastModified": 1740485968, "lastModified": 1741786315,
"narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,11 +85,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1732381887, "lastModified": 1741485571,
"narHash": "sha256-BN5xYNaROH5yE5KR5ZJfYte/Dl4G2schjkalmQoQq8s=", "narHash": "sha256-fpm1ZTfGfMG36c4G3HSwmbd09zU3egmM0dfgDxkT3h4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "61af138b0b7ffc19b1221b5d6d28f164a8c0d919", "rev": "db37ae9cd947031ad83288dec514233ffd262ffd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,11 +104,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1740551776, "lastModified": 1742452566,
"narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=", "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "07a730bc80e8a4106df5b2341aa5602a240ee112", "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
"nixpkgs-lib": ["nixpkgs"] "nixpkgs-lib": ["nixpkgs"]
}, },
"locked": { "locked": {
"lastModified": 1740872218, "lastModified": 1741352980,
"narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3876f6b87db82f33775b1ef5ea343986105db764", "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +237,11 @@
}, },
"gimp-nixpkgs": { "gimp-nixpkgs": {
"locked": { "locked": {
"lastModified": 1735507908, "lastModified": 1742290322,
"narHash": "sha256-VA+khC0S0di6w5Yv1kBNRpAihnt2prT/ehQzsKMhEoA=", "narHash": "sha256-k9JklbgcYhEzNgwNMP+dDF7VgYRokmAYvnqyNbBmip0=",
"owner": "jtojnar", "owner": "jtojnar",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "771cf18187fefcfaababd35834917c621447fee8", "rev": "c88e4e90048eaeaadc0caec090fed4ce5cc62240",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
"nixpkgs": ["nixpkgs"] "nixpkgs": ["nixpkgs"]
}, },
"locked": { "locked": {
"lastModified": 1740915799, "lastModified": 1742649964,
"narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
"nixpkgs": ["chaotic", "nixpkgs"] "nixpkgs": ["chaotic", "nixpkgs"]
}, },
"locked": { "locked": {
"lastModified": 1740494361, "lastModified": 1742569620,
"narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +333,11 @@
"nixpkgs": ["chaotic", "nixpkgs"] "nixpkgs": ["chaotic", "nixpkgs"]
}, },
"locked": { "locked": {
"lastModified": 1740553144, "lastModified": 1742465245,
"narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=", "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "14a125ea5c440c57310dc1bb3acf7641078d783a", "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1740828860, "lastModified": 1742422364,
"narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,16 +442,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1731797254, "lastModified": 1741332913,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -474,11 +474,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1742422364,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -584,15 +584,14 @@
"pankomacs": { "pankomacs": {
"inputs": { "inputs": {
"emacs": "emacs", "emacs": "emacs",
"nixpkgs": ["nixpkgs"], "nixpkgs": ["nixpkgs"]
"parts": "parts"
}, },
"locked": { "locked": {
"lastModified": 1740841259, "lastModified": 1742662372,
"narHash": "sha256-hAO+msbKCMa/VtXyYf4yOY/XGevat1sOJkk6+WTXFlU=", "narHash": "sha256-lXcxLy/bhivOl/Y/SzEGY7iLSU60muOlH8wzyHAGXoM=",
"ref": "main", "ref": "main",
"rev": "4b6be377dd7b9a2d207524d361a24d621521cf7d", "rev": "9dc57c7c7e958f7e329344f5062dc04fa3a42210",
"revCount": 93, "revCount": 100,
"type": "git", "type": "git",
"url": "https://codeberg.org/amadaluzia/pankomacs.git" "url": "https://codeberg.org/amadaluzia/pankomacs.git"
}, },
@ -602,24 +601,6 @@
"url": "https://codeberg.org/amadaluzia/pankomacs.git" "url": "https://codeberg.org/amadaluzia/pankomacs.git"
} }
}, },
"parts": {
"inputs": {
"nixpkgs-lib": ["pankomacs", "nixpkgs"]
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"alqages": "alqages", "alqages": "alqages",
@ -655,11 +636,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740470570, "lastModified": 1742296961,
"narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=", "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "89255449982473939a4f8ee954512d339225c182", "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +718,11 @@
}, },
"wallpkgs": { "wallpkgs": {
"locked": { "locked": {
"lastModified": 1740255634, "lastModified": 1742389992,
"narHash": "sha256-qVqZ0Frq58qEogL4SVyqu+cPAoqlxICFyvwYlGAnhgw=", "narHash": "sha256-qgzpp5/oanA2dbiePVk7C0bK1Gm7hbHCB8R721xU2n0=",
"owner": "notashelf", "owner": "notashelf",
"repo": "wallpkgs", "repo": "wallpkgs",
"rev": "3a4ad716c3e1402b2d03b8aa7629108a931e976f", "rev": "28c5d1b7d27e067888fe5db6485ef5d0acfb5140",
"type": "github" "type": "github"
}, },
"original": { "original": {

136
hosts/outback/configuration.nix
View file

@ -1,136 +0,0 @@
{
modulesPath,
lib,
inputs,
pkgs,
...
}: let
theme = {
gtk = {
name = "Orchis";
package = pkgs.orchis-theme;
};
};
in {
imports = [
(modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
];
boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
networking.networkmanager.enable = true;
time.timeZone = lib.mkForce null; # let automatic-timezoned do that job
services.automatic-timezoned.enable = true;
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
services.xserver.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = [
pkgs.gnome-console
];
alqueva.system.dconf = {
luminosity = "dark";
gtk.theme = theme.gtk.name;
icon.theme = "";
extraDconfSettings = {
"org/gnome/desktop/background" = {
picture-uri = inputs.wallpkgs.wallpapers.nature-07.path;
};
};
};
systemd.user.tmpfiles.rules = [
"L+ %h/.config/gtk-4.0 - - - - ${theme.gtk.package}/share/themes/${theme.gtk.name}/gtk-4.0"
];
# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable sound.
# services.pulseaudio.enable = true;
# OR
# services.pipewire = {
# enable = true;
# pulse.enable = true;
# };
# Enable touchpad support (enabled default in most desktopManager).
# services.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
# users.users.alice = {
# isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
# packages = with pkgs; [
# tree
# ];
# };
# programs.firefox.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = [
pkgs.alacritty
pkgs.neovim
pkgs.wget
pkgs.tela-icon-theme
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
#
# Most users should NEVER change this value after the initial install, for any reason,
# even if you've upgraded your system to a new NixOS release.
#
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
# to actually do that.
#
# This value being lower than the current NixOS release does NOT mean your system is
# out of date, out of support, or vulnerable.
#
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
# and migrated your data accordingly.
#
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "25.05"; # Did you read the comment?
}

63
hosts/outback/hardware-configuration.nix
View file

@ -1,63 +0,0 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/62c55ba0-c379-4948-872e-9d51dd63ab06";
fsType = "btrfs";
options = ["subvol=@root"];
};
boot.initrd.luks.devices."utero".device = "/dev/disk/by-uuid/3343076a-6d02-47b6-86fb-395402b297cd";
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/62c55ba0-c379-4948-872e-9d51dd63ab06";
fsType = "btrfs";
options = ["subvol=@nix"];
};
fileSystems."/.swapvol" = {
device = "/dev/disk/by-uuid/62c55ba0-c379-4948-872e-9d51dd63ab06";
fsType = "btrfs";
options = ["subvol=@swap"];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/62c55ba0-c379-4948-872e-9d51dd63ab06";
fsType = "btrfs";
options = ["subvol=@home"];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/139F-0A2E";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
# networking.interfaces.virbr0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

6
hosts/shared/direnv.nix
View file

@ -2,9 +2,11 @@
config, config,
lib, lib,
... ...
}: let }:
let
cfg = config.alqueva.programs.direnv; cfg = config.alqueva.programs.direnv;
in { in
{
options.alqueva.programs.direnv = { options.alqueva.programs.direnv = {
enable = lib.mkEnableOption "direnv"; enable = lib.mkEnableOption "direnv";
}; };

41
hosts/shared/fonts.nix
View file

@ -3,65 +3,71 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
let
cfg = config.alqueva.system.fonts; cfg = config.alqueva.system.fonts;
inherit (lib) types mkOption; inherit (lib) types mkOption;
mkStringsOption = default: letterform: mkStringsOption =
default: letterform:
mkOption { mkOption {
type = types.listOf types.str; type = types.listOf types.str;
inherit default; inherit default;
description = "The default fonts for ${letterform}."; description = "The default fonts for ${letterform}.";
}; };
mkPackagesOption = default: letterform: mkPackagesOption =
default: letterform:
mkOption { mkOption {
type = types.listOf types.package; type = types.listOf types.package;
inherit default; inherit default;
description = "The packages you want to use for your ${letterform} fonts."; description = "The packages you want to use for your ${letterform} fonts.";
}; };
in { in
{
options.alqueva.system.fonts = { options.alqueva.system.fonts = {
enable = lib.mkEnableOption "" // {description = "Whether you want to use this fonts module.";}; enable = lib.mkEnableOption "" // {
description = "Whether you want to use this fonts module.";
};
packages = packages =
{ {
extra = mkOption { extra = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [ ];
description = "Extra font packages you want installed."; description = "Extra font packages you want installed.";
}; };
} }
// builtins.mapAttrs (_n: v: mkPackagesOption v.default v.letterform) { // builtins.mapAttrs (_n: v: mkPackagesOption v.default v.letterform) {
sansSerif = { sansSerif = {
default = [pkgs.roboto]; default = [ pkgs.roboto ];
letterform = "sans-serif"; letterform = "sans-serif";
}; };
monospace = { monospace = {
default = [pkgs.roboto-mono]; default = [ pkgs.roboto-mono ];
letterform = "monospace"; letterform = "monospace";
}; };
serif = { serif = {
default = [pkgs.roboto-serif]; default = [ pkgs.roboto-serif ];
letterform = "serif"; letterform = "serif";
}; };
emoji = { emoji = {
default = [pkgs.noto-fonts-color-emoji]; default = [ pkgs.noto-fonts-color-emoji ];
letterform = "emoji"; letterform = "emoji";
}; };
}; };
names = builtins.mapAttrs (_n: v: mkStringsOption v.default v.letterform) { names = builtins.mapAttrs (_n: v: mkStringsOption v.default v.letterform) {
sansSerif = { sansSerif = {
default = ["Roboto"]; default = [ "Roboto" ];
letterform = "sans-serif"; letterform = "sans-serif";
}; };
monospace = { monospace = {
default = ["Roboto Mono"]; default = [ "Roboto Mono" ];
letterform = "monospace"; letterform = "monospace";
}; };
serif = { serif = {
default = ["Roboto Serif"]; default = [ "Roboto Serif" ];
letterform = "serif"; letterform = "serif";
}; };
emoji = { emoji = {
default = ["Noto Color Emoji"]; default = [ "Noto Color Emoji" ];
letterform = "emoji"; letterform = "emoji";
}; };
}; };
@ -71,7 +77,12 @@ in {
packages = builtins.concatLists (builtins.attrValues cfg.packages); packages = builtins.concatLists (builtins.attrValues cfg.packages);
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
inherit (cfg.names) sansSerif monospace serif emoji; inherit (cfg.names)
sansSerif
monospace
serif
emoji
;
}; };
enable = true; enable = true;
}; };

116
hosts/shared/git.nix
View file

@ -1,116 +0,0 @@
{
config,
lib,
...
}:
let
cfg = config.alqueva.programs.git;
in
{
options.alqueva.programs.git = {
enable = lib.mkEnableOption "git";
};
config = lib.mkIf cfg.enable {
programs.git = {
enable = true;
config = {
alias = {
a = "add";
aa = "add .";
aliases = "! f(){ TOP=$(expr $(grep -n \"^\\\\\\\\[alias\" /etc/gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n \"^\\\\\\\\[\" /etc/gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM=$(expr $LINE_NUMBER - 2 ) && break; done; sed -n \"\${TOP},\${BOTTOM}p\" /etc/gitconfig; }; f | sed -e 's|^ ||'";
ap = "add -p";
b = "! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'";
bD = "branch -D";
ba = "branch -a";
bc = "branch -c";
bd = "branch -d";
br = "branch -r";
c = "! git commit --verbose; git push";
ca = "! git c --amend";
cf = "! git commit --verbose; git push --force";
ch = "switch -C";
change = "switch -C";
cl = "clone";
cm = "commit -m";
co = "checkout "; # old/bad practice - switches branch and can modify worktree
cp = "cherry-pick ; usually abusive; sometimes necessary";
create = "! git bc";
d = "diff";
dc = "diff --cached";
ds = "diff --stat";
expire = "! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now";
f = "fetch";
fe = "fetch";
filelog = "log --patch";
find = "! git ls-files | grep -i";
fl = "log --patch";
fp = "fetch --prune ; removes branches not in upstream";
gr = "grep -Ii";
grep = "grep -Ii";
greproot = "! git grr";
grr = "! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f";
invert = "revert";
l = "log --oneline --graph --decorate --parents";
lasttag = "describe --tags --abbrev=0";
ll = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate --numstat";
lref = "log --oneline --graph --decorate --parents --reflog";
ls = "log --pretty=format:\"%C(yellow)%h\\\\ %ad%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate --date=short";
lt = "describe --tags --abbrev=0";
mailmap = "! f(){ printf \\\"$(git config user.name) <$(git config user.email)> <\${1}>\\\" > mailmap; git filter-repo --force --mailmap mailmap; }; f";
one = "log -1 ; no input displays HEAD";
pd = "push -d";
pf = "push --force";
pl = "pull";
pp = "pull --prune ; removes branches not in upstream";
pr = "pull --rebase ; rebases commits onto upstream";
ps = "push";
pt = "! f(){ git push $1 tag $2; }; f";
r = "rebase";
ra = "rebase --skip";
rc = "rebase --continue";
re = "restore";
ref = "reflog";
ri = "rebase --interactive";
rm = "rm -r";
rmf = "! git rm --force";
rq = "rebase --quit";
rs = "rebase --abort";
sh = "show";
st = "status";
sw = "switch ; new checkout - only switching branch w/o restoring worktree";
sync = "! git fe upstream; git rebase upstream/main; git push";
t = "tag";
td = "tag --delete";
un = "restore --staged --worktree";
uncommit = "switch -C";
undo = "restore --staged --worktree";
undo-specific = "! f(){ git restore --source=\\\"$1\\\" $2; }; f";
undo-stage = "restore";
undo-unstaged = "restore";
undo-work = "restore --staged --worktree";
undo-wt = "restore --staged --worktree";
unstage = "restore --staged";
wa = "! f(){ git worktree add ../$1 $1; }; f";
wc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q \"main\"; then BRANCH=\"main\"; elif git ls-remote $1 | grep -q \"master\"; then BRANCH=\"master\"; elif git ls-remote $1 | grep -q \"trunk\"; then BRANCH=\"trunk\"; fi; git clone $1 $BRANCH; }; f";
wcreate = "! git wc";
wmv = "worktree move";
wnew = "! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f";
wr = "worktree remove";
wrm = "! git wr";
wsc = "! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q \"main\"; then BRANCH=\"main\"; elif git ls-remote $1 | grep -q \"master\"; then BRANCH=\"master\"; elif git ls-remote $1 | grep -q \"trunk\"; then BRANCH=\"trunk\"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f";
wshallow = "! git wsc";
};
branch = {
autosetuprebase = "always";
};
color = {
branch = "auto";
diff = "auto";
status = "auto";
};
commit.gpgsign = true;
};
};
};
}

35
hosts/shared/nushell.nix
View file

@ -5,21 +5,34 @@
... ...
}: }:
let let
inherit (lib.options) mkOption mkPackageOption mkEnableOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) nullOr str;
cfg = config.alqueva.shells.nushell; cfg = config.alqueva.shells.nushell;
in in
{ {
options.alqueva.shells.nushell = { options.alqueva.shells.nushell = {
enable = lib.mkEnableOption "Nushell"; enable = mkEnableOption "Nushell";
package = lib.mkPackageOption pkgs "nushell" { }; package = mkPackageOption pkgs "nushell" { };
}; config = mkOption {
type = nullOr str;
config = lib.mkIf cfg.enable { default = null;
environment = { description = "Nushell code to load by default with Nushell.";
systemPackages = [ cfg.package ];
shells = [
(lib.getExe' cfg.package "nu")
"/run/current-system/sw/bin/nu"
];
}; };
}; };
config = mkIf cfg.enable (mkMerge [
{
environment = {
systemPackages = [ cfg.package ];
shells = [
(lib.getExe' cfg.package "nu")
"/run/current-system/sw/bin/nu"
];
};
}
(mkIf (cfg.config != null) {
environment.systemPackages = [ ];
})
]);
} }

14
hosts/shared/waybar.nix
View file

@ -3,19 +3,21 @@
pkgs, pkgs,
config, config,
... ...
}: let }:
let
cfg = config.alqueva.programs.waybar; cfg = config.alqueva.programs.waybar;
in { in
{
options.alqueva.programs.waybar = { options.alqueva.programs.waybar = {
enable = lib.mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors"; enable = lib.mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors";
package = lib.mkPackageOption pkgs "waybar" {}; package = lib.mkPackageOption pkgs "waybar" { };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [cfg.package]; environment.systemPackages = [ cfg.package ];
systemd = { systemd = {
packages = [cfg.package]; packages = [ cfg.package ];
user.services.waybar.wantedBy = ["graphical-session.target"]; user.services.waybar.wantedBy = [ "graphical-session.target" ];
}; };
}; };
} }

41
hosts/solterra/apps.nix
View file

@ -20,7 +20,7 @@
programs = { programs = {
swaybg = { swaybg = {
enable = true; enable = true;
wallpaper = inputs.wallpkgs.wallpapers.everforest-foggy_valley_1.path; wallpaper = inputs.wallpkgs.wallpapers.dracula.dracula-ship.path;
}; };
waybar = { waybar = {
enable = true; enable = true;
@ -34,7 +34,6 @@
sound = ../../media/majoras_mask_bell.wav; sound = ../../media/majoras_mask_bell.wav;
}; };
direnv.enable = true; direnv.enable = true;
git.enable = true;
openssh.enable = true; openssh.enable = true;
}; };
shells = { shells = {
@ -51,22 +50,28 @@
wms.niri.enable = true; wms.niri.enable = true;
}; };
programs.nh = { programs = {
enable = true; nh = {
clean.enable = true; enable = true;
package = pkgs.symlinkJoin { clean.enable = true;
name = "nh"; package = pkgs.symlinkJoin {
paths = [ name = "nh";
pkgs.nh paths = [
]; pkgs.nh
nativeBuildInputs = [ ];
pkgs.makeWrapper nativeBuildInputs = [
]; pkgs.makeWrapper
postBuild = '' ];
wrapProgram $out/bin/nh \ postBuild = ''
--set FLAKE "/home/artur/.config/nixos" wrapProgram $out/bin/nh \
''; --set FLAKE "/home/artur/.config/nixos"
meta = { inherit (pkgs.nh.meta) mainProgram; }; '';
meta = { inherit (pkgs.nh.meta) mainProgram; };
};
};
git = {
enable = true;
package = pkgs.gitFull;
}; };
}; };

2
hosts/solterra/default.nix
View file

@ -28,6 +28,8 @@
inputs.alqages.overlays.default inputs.alqages.overlays.default
]; ];
nix.package = pkgs.lix;
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
keyMap = "us"; keyMap = "us";

12
hosts/solterra/fonts.nix
View file

@ -2,16 +2,16 @@
{ {
alqueva.system.fonts = { alqueva.system.fonts = {
names = { names = {
sansSerif = [ "Iosevka" ]; sansSerif = [ "Inter" ];
monospace = [ "Iosevka" ]; monospace = [ "Maple Mono" ];
serif = [ "IBM Plex Serif" ]; serif = [ "Merriweather" ];
emoji = [ "Twitter Color Emoji" ]; emoji = [ "Twitter Color Emoji" ];
}; };
packages = { packages = {
sansSerif = [ pkgs.inter ]; sansSerif = [ pkgs.inter ];
monospace = [ pkgs.iosevka ]; monospace = [ pkgs.maple-mono ];
serif = [ pkgs.ibm-plex ]; serif = [ pkgs.merriweather ];
emoji = [ pkgs.twemoji-color-font ]; emoji = [ pkgs.twitter-color-emoji ];
extra = [ extra = [
pkgs.noto-fonts pkgs.noto-fonts
pkgs.nerd-fonts.symbols-only pkgs.nerd-fonts.symbols-only

37
hosts/solterra/theme.nix
View file

@ -1,45 +1,23 @@
{ {
pkgs, pkgs,
config,
... ...
}: }:
let let
themes = { themes = {
# gtk-theme = pkgs.everforest-gtk-theme; gtk-theme = pkgs.dracula-theme-git;
gtk-theme = pkgs.everforest-gtk-theme.overrideAttrs (finalAttrs: { icon-theme = pkgs.dracula-icon-theme;
version = "0-unstable-2024-11-06"; cursor-theme = themes.icon-theme;
src = pkgs.fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = finalAttrs.pname;
rev = "43cbe4f1aeba8b46e41836de4c8ea7ac398db119";
hash = "sha256-Z46i0Ihpzo4LhFvzKsvnzcHFzeYxJMvQmg2k6lmjGH0=";
};
nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [
pkgs.sassc
];
installPhase = ''
runHook preInstall
mkdir -p "$out"/share/{icons,themes}
cp -a icons/* "$out"/share/icons/
patchShebangs ./themes/install.sh
./themes/install.sh -d "$out"/share/themes/
runHook postInstall
'';
});
icon-theme = themes.gtk-theme;
cursor-theme = pkgs.simp1e-cursors;
}; };
cfg = config.alqueva.system.dconf;
in in
{ {
alqueva.system.dconf = { alqueva.system.dconf = {
enable = true; enable = true;
luminosity = "dark"; luminosity = "dark";
theme = "everforest-gtk-theme-0-unstable-2024-11-06-Dark"; theme = "Dracula";
icon.theme = "Everforest-Dark"; icon.theme = "Dracula";
cursor = { cursor = {
size = 24; size = 24;
theme = "Simp1e-Gruvbox-Dark"; theme = "Dracula-cursors";
}; };
}; };
@ -50,7 +28,4 @@ in
}; };
environment.systemPackages = builtins.attrValues themes; environment.systemPackages = builtins.attrValues themes;
systemd.user.tmpfiles.rules = [
"L+ %h/.config/gtk-4.0 - - - - ${themes.gtk-theme}/share/themes/${cfg.theme}/gtk-4.0"
];
} }

14
hosts/solterra/users/artur/configs/dunst/dunstrc
View file

@ -333,24 +333,24 @@
[urgency_low] [urgency_low]
# IMPORTANT: colors have to be defined in quotation marks. # IMPORTANT: colors have to be defined in quotation marks.
# Otherwise the "#" and following would be interpreted as a comment. # Otherwise the "#" and following would be interpreted as a comment.
background = "#2b3339" background = "#282a36"
foreground = "#d3c6aa" foreground = "#f8f8f2"
timeout = 10 timeout = 10
# Icon for notifications with low urgency # Icon for notifications with low urgency
default_icon = dialog-information default_icon = dialog-information
[urgency_normal] [urgency_normal]
background = "#343f44" background = "#44475a"
foreground = "#d3c6aa" foreground = "#f8f8f2"
timeout = 10 timeout = 10
override_pause_level = 30 override_pause_level = 30
# Icon for notifications with normal urgency # Icon for notifications with normal urgency
default_icon = dialog-information default_icon = dialog-information
[urgency_critical] [urgency_critical]
background = "#543a48" background = "#ff5555"
foreground = "#d3c6aa" foreground = "#44475a"
frame_color = "#d3c6aa" frame_color = "#44475a"
timeout = 0 timeout = 0
override_pause_level = 60 override_pause_level = 60
# Icon for notifications with critical urgency # Icon for notifications with critical urgency

50
hosts/solterra/users/artur/configs/foot/foot.ini
View file

@ -1,29 +1,29 @@
[main] [main]
pad=8x8 pad=8x8
font=monospace:size=13 font=monospace:size=16.5
[colors] [colors]
foreground=e5e9f0 foreground=f8f8f2
background=2e3440 background=282a36
regular0=3b4252 regular0=363447 # black
regular1=bf616a regular1=ff5555 # red
regular2=a3be8c regular2=50fa7b # green
regular3=ebcb8b regular3=f1fa8c # yellow
regular4=81a1c1 regular4=80bfff # blue
regular5=b48ead regular5=ff79c6 # magenta
regular6=88c0d0 regular6=8be9fd # cyan
regular7=eceff4 regular7=f0f1f4 # white
bright0=434c5e bright0=44475a # bright black
bright1=bf616a bright1=ff5555 # bright red
bright2=a3be8c bright2=50fa7b # bright green
bright3=ebcb8b bright3=f1fa8c # bright yellow
bright4=81a1c1 bright4=80bfff # bright blue
bright5=b48ead bright5=ff79c6 # bright magenta
bright6=88c0d0 bright6=8be9fd # bright cyan
bright7=8fbcbb bright7=ffffff # bright white
16=d08770 16=ffb86c
17=5e81ac 17=bd93f9
18=3b4252 18=363447
19=434c5e 19=44475a
20=d8dee9 20=9ea8c7
21=eceff4 21=f0f1f4

110
hosts/solterra/users/artur/configs/git/gitconfig Normal file
View file

@ -0,0 +1,110 @@
[alias]
a=add
aa=add .
aliases=! f(){ TOP=$(expr $(grep -n "^\\\\[alias" ~/.gitconfig | sed -e 's|:.*||') + 1) && for LINE_NUMBER in $(grep -n "^\\\\[" ~/.gitconfig | sed -e 's|:.*||'); do [ $TOP -lt $LINE_NUMBER ] && BOTTOM=$(expr $LINE_NUMBER - 2 ) && break; done; sed -n "${TOP},${BOTTOM}p" ~/.gitconfig; }; f | sed -e 's|^ ||'
ap=add -p
b=! git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's|refs/heads/||'
bD=branch -D
ba=branch -a
bc=branch -c
bd=branch -d
br=branch -r
c=! git commit --verbose; git push
ca=! git c --amend
cf=! git commit --verbose; git push --force
ch=switch -C
change=switch -C
cl=clone
cm=commit -m
co=checkout
cp=cherry-pick ; usually abusive; sometimes necessary
create=! git bc
d=diff
dc=diff --cached
ds=diff --stat
expire=! git fsck --unreachable --dangling --no-reflogs; git reflog expire --expire=now --all; git gc --prune=now
f=fetch
fe=fetch
filelog=log --patch
find=! git ls-files | grep -i
fl=log --patch
fp=fetch --prune ; removes branches not in upstream
gr=grep -Ii
grep=grep -Ii
greproot=! git grr
grr=! f() { ROOT=$(git rev-parse --show-toplevel) && cd $ROOT && git grep --full-name -In $1 | xargs -I{} echo $ROOT/{}; }; f
invert=revert
l=log --oneline --graph --decorate --parents
lasttag=describe --tags --abbrev=0
ll=log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
lref=log --oneline --graph --decorate --parents --reflog
ls=log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
lt=describe --tags --abbrev=0
mailmap=! f(){ printf \"$(git config user.name) <$(git config user.email)> <${1}>\" > mailmap; git filter-repo --force --mailmap mailmap; }; f
one=log -1 ; no input displays HEAD
pd=push -d
pf=push --force
pl=pull
pp=pull --prune ; removes branches not in upstream
pr=pull --rebase ; rebases commits onto upstream
ps=push
pt=! f(){ git push $1 tag $2; }; f
r=rebase
ra=rebase --skip
rc=rebase --continue
re=restore
ref=reflog
ri=rebase --interactive
rm=rm -r
rmf=! git rm --force
rq=rebase --quit
rs=rebase --abort
sh=show
st=status
sw=switch ; new checkout - only switching branch w/o restoring worktree
sync=! git fe upstream; git rebase upstream/main; git push
t=tag
td=tag --delete
un=restore --staged --worktree
uncommit=switch -C
undo=restore --staged --worktree
undo-specific=! f(){ git restore --source=\"$1\" $2; }; f
undo-stage=restore
undo-unstaged=restore
undo-work=restore --staged --worktree
undo-wt=restore --staged --worktree
unstage=restore --staged
wa=! f(){ git worktree add ../$1 $1; }; f
wc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone $1 $BRANCH; }; f
wcreate=! git wc
wmv=worktree move
wnew=! f(){ git worktree add ../$1; cd ../$1; git push --set-upstream origin $1; }; f
wr=worktree remove
wrm=! git wr
wsc=! f(){ PROJ=$(printf $1 | sed -e 's|.*/||' | sed -e 's|.git||'); mkdir $PROJ; cd $PROJ; if git ls-remote $1 | grep -q "main"; then BRANCH="main"; elif git ls-remote $1 | grep -q "master"; then BRANCH="master"; elif git ls-remote $1 | grep -q "trunk"; then BRANCH="trunk"; fi; git clone --depth=1 --single-branch $1 $BRANCH; }; f
wshallow=! git wsc
[branch]
autosetuprebase=always
[color]
branch=auto
diff=auto
status=auto
[commit]
gpgsign=true
[gpg]
format=ssh
[user]
email=amad@atl.tools
name=Artur Manuel
signingKey=~/.ssh/id_ed25519.pub
[init]
defaultBranch = "main"
[credential]
helper = "git-credential-libsecret"

23
hosts/solterra/users/artur/configs/niri/config.kdl
View file

@ -114,9 +114,9 @@ layout {
// Proportion sets the width as a fraction of the output width, taking gaps into account. // Proportion sets the width as a fraction of the output width, taking gaps into account.
// For example, you can perfectly fit four windows sized "proportion 0.25" on an output. // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
// The default preset widths are 1/3, 1/2 and 2/3 of the output. // The default preset widths are 1/3, 1/2 and 2/3 of the output.
proportion 0.33333 proportion 0.4
proportion 0.5 proportion 0.6
proportion 0.66667 proportion 0.8
// Fixed sets the width in logical pixels exactly. // Fixed sets the width in logical pixels exactly.
// fixed 1920 // fixed 1920
@ -126,7 +126,7 @@ layout {
// preset-window-heights { } // preset-window-heights { }
// You can change the default width of the new windows. // You can change the default width of the new windows.
default-column-width { proportion 0.5; } default-column-width { proportion 0.4; }
// If you leave the brackets empty, the windows themselves will decide their initial width. // If you leave the brackets empty, the windows themselves will decide their initial width.
// default-column-width {} // default-column-width {}
@ -144,7 +144,7 @@ layout {
// You can change how the focus ring looks. // You can change how the focus ring looks.
focus-ring { focus-ring {
// Uncomment this line to disable the focus ring. // Uncomment this line to disable the focus ring.
// off off
// How many logical pixels the ring extends out from the windows. // How many logical pixels the ring extends out from the windows.
width 2 width 2
@ -180,11 +180,11 @@ layout {
border { border {
// The settings are the same as for the focus ring. // The settings are the same as for the focus ring.
// If you enable the border, you probably want to disable the focus ring. // If you enable the border, you probably want to disable the focus ring.
off // off
width 0 width 1
active-color "#ffc87f" active-color "#bd93f9"
inactive-color "#505050" inactive-color "#6272a4"
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
@ -293,7 +293,8 @@ binds {
Mod+Shift+Slash { show-hotkey-overlay; } Mod+Shift+Slash { show-hotkey-overlay; }
// Suggested binds for running programs: terminal, app launcher, screen locker. // Suggested binds for running programs: terminal, app launcher, screen locker.
Mod+T { spawn "emacs"; } Mod+E { spawn "emacs"; }
Mod+T { spawn "foot"; }
Mod+D { spawn "rofi" "-show" "drun"; } Mod+D { spawn "rofi" "-show" "drun"; }
// Super+Alt+L { spawn "swaylock"; } // Super+Alt+L { spawn "swaylock"; }
@ -510,6 +511,6 @@ binds {
} }
cursor { cursor {
xcursor-theme "Simp1e-Gruvbox-Dark" xcursor-theme "Dracula-cursors"
xcursor-size 24 xcursor-size 24
} }

36
hosts/solterra/users/artur/configs/qutebrowser/config.py
View file

@ -2,26 +2,26 @@ from theme import load_theme
config.load_autoconfig() config.load_autoconfig()
everforest = { dracula = {
"base00": "#2b3339", "base00": "#282a36",
"base01": "#323c41", "base01": "#363447",
"base02": "#503946", "base02": "#44475a",
"base03": "#868d80", "base03": "#6272a4",
"base04": "#d3c6aa", "base04": "#9ea8c7",
"base05": "#d3c6aa", "base05": "#f8f8f2",
"base06": "#e9e8d2", "base06": "#f0f1f4",
"base07": "#fff9e8", "base07": "#ffffff",
"base08": "#7fbbb3", "base08": "#ff5555",
"base09": "#d699b6", "base09": "#ffb86c",
"base0A": "#83c092", "base0A": "#f1fa8c",
"base0B": "#dbbc7f", "base0B": "#50fa7b",
"base0C": "#e69875", "base0C": "#8be9fd",
"base0D": "#a7c080", "base0D": "#80bfff",
"base0E": "#e67e80", "base0E": "#ff79c6",
"base0F": "#d699b6", "base0F": "#bd93f9",
} }
load_theme(c, everforest) load_theme(c, dracula)
c.colors.webpage.preferred_color_scheme = "dark" c.colors.webpage.preferred_color_scheme = "dark"
c.tabs.position = "top" c.tabs.position = "top"

2
hosts/solterra/users/artur/configs/rofi/config.rasi
View file

@ -12,7 +12,7 @@ configuration{
display-drun: "  Apps "; display-drun: "  Apps ";
} }
@theme "nord" @theme "base16"
element-text, element-icon , mode-switcher { element-text, element-icon , mode-switcher {
background-color: inherit; background-color: inherit;

11
hosts/solterra/users/artur/configs/rofi/themes/base16.rasi Normal file
View file

@ -0,0 +1,11 @@
* {
bg-col: #282a36;
bg-col-light: #44475a;
border-col: #44475a;
selected-col: #44475a;
blue: #bd93f9;
fg-col: #f8f8f2;
fg-col2: #f8f8f2;
grey: #6272a4;
width: 600;
}

11
hosts/solterra/users/artur/configs/rofi/themes/nord.rasi
View file

@ -1,11 +0,0 @@
* {
bg-col: #2D353B;
bg-col-light: #343F44;
border-col: #343F44;
selected-col: #343F44;
blue: #7FBBB3;
fg-col: #D3C6AA;
fg-col2: #D3C6AA;
grey: #7A8478;
width: 600;
}

4
hosts/solterra/users/artur/configs/vesktop/quickCss.css
View file

@ -1,3 +1,5 @@
:root { :root {
--font: "Monospace"; --font-primary: "sans";
--font-display: "sans";
--font-code: "monospace";
} }

2
hosts/solterra/users/artur/configs/waybar/config.jsonc
View file

@ -1,5 +1,5 @@
{ {
"position": "bottom", "position": "top",
"height": 0, "height": 0,
"modules-left": ["custom/nixos", "niri/workspaces"], "modules-left": ["custom/nixos", "niri/workspaces"],
"modules-center": ["mpris"], "modules-center": ["mpris"],

35
hosts/solterra/users/artur/configs/waybar/style.css
View file

@ -1,24 +1,25 @@
@define-color base00 #2b3339; @define-color base00 #282a36;
@define-color base01 #323c41; @define-color base01 #363447;
@define-color base02 #503946; @define-color base02 #44475a;
@define-color base03 #868d80; @define-color base03 #6272a4;
@define-color base04 #d3c6aa; @define-color base04 #9ea8c7;
@define-color base05 #d3c6aa; @define-color base05 #f8f8f2;
@define-color base06 #e9e8d2; @define-color base06 #f0f1f4;
@define-color base07 #fff9e8; @define-color base07 #ffffff;
@define-color base08 #7fbbb3; @define-color base08 #ff5555;
@define-color base09 #d699b6; @define-color base09 #ffb86c;
@define-color base0A #83c092; @define-color base0A #f1fa8c;
@define-color base0B #dbbc7f; @define-color base0B #50fa7b;
@define-color base0C #e69875; @define-color base0C #8be9fd;
@define-color base0D #a7c080; @define-color base0D #80bfff;
@define-color base0E #e67e80; @define-color base0E #ff79c6;
@define-color base0F #d699b6; @define-color base0F #bd93f9;
* { * {
all: unset; all: unset;
color: @base05; color: @base05;
min-height: 0px; min-height: 0px;
font-family: monospace;
} }
window#waybar { window#waybar {
@ -52,7 +53,7 @@ tooltip {
#custom-nixos { #custom-nixos {
padding: 0px 12px; padding: 0px 12px;
font-size: 24px; font-size: 24px;
color: @base08; color: @base0D;
} }
menu { menu {

14
hosts/solterra/users/artur/default.nix
View file

@ -10,16 +10,6 @@
tmpfiles = [ tmpfiles = [
"L+ %h/.config/qutebrowser/config.py - - - - ${./configs/qutebrowser/config.py}" "L+ %h/.config/qutebrowser/config.py - - - - ${./configs/qutebrowser/config.py}"
"L+ %h/.config/qutebrowser/theme - - - - ${./configs/qutebrowser/theme}" "L+ %h/.config/qutebrowser/theme - - - - ${./configs/qutebrowser/theme}"
(
let
theme = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/deathbeam/base16-discord/refs/heads/main/themes/base16-nord.theme.css";
hash = "sha256-LofqgsVl+XKisk/dmb/PpwuLEWdEgchIfIw4xZs6LQw=";
};
in
"L+ %h/.config/vesktop/themes/theme.user.css - - - - ${theme}"
)
"L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
"L+ %h/.config/kanshi/ - - - - ${./configs/kanshi}" "L+ %h/.config/kanshi/ - - - - ${./configs/kanshi}"
"L+ %h/.config/dunst/ - - - - ${./configs/dunst}" "L+ %h/.config/dunst/ - - - - ${./configs/dunst}"
"L+ %h/.config/niri/ - - - - ${./configs/niri}" "L+ %h/.config/niri/ - - - - ${./configs/niri}"
@ -27,12 +17,13 @@
"L+ %h/.config/foot - - - - ${./configs/foot}" "L+ %h/.config/foot - - - - ${./configs/foot}"
"L+ %h/.config/waybar - - - - ${./configs/waybar}" "L+ %h/.config/waybar - - - - ${./configs/waybar}"
"L+ %h/.face.icon - - - - ${./.face.icon}" "L+ %h/.face.icon - - - - ${./.face.icon}"
"L+ %h/.gitconfig - - - - ${./configs/git/gitconfig}"
"L+ %h/.config/vesktop/settings/quickCss.css - - - - ${./configs/vesktop/quickCss.css}"
]; ];
packages = builtins.attrValues { packages = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
eww eww
wget wget
vesktop-electron32
mpv mpv
imv imv
amberol amberol
@ -50,6 +41,7 @@
signal-desktop signal-desktop
dino dino
polari polari
vesktop
; ;
inherit (inputs.hetch.packages.${pkgs.system}) hetch; inherit (inputs.hetch.packages.${pkgs.system}) hetch;
inherit (inputs.gimp-nixpkgs.legacyPackages.${pkgs.system}) gimp; inherit (inputs.gimp-nixpkgs.legacyPackages.${pkgs.system}) gimp;

4
shells/default.nix
View file

@ -14,7 +14,9 @@
pre-commit = { pre-commit = {
check.enable = true; check.enable = true;
settings.hooks = { settings.hooks = {
nixfmt-rfc-style.enable = true; nixfmt-rfc-style = {
enable = true;
};
nil.enable = true; nil.enable = true;
shellcheck.enable = true; shellcheck.enable = true;
prettier.enable = true; prettier.enable = true;