Compare commits
1 commit
8f5942938e
...
d77f227cf5
| Author | SHA1 | Date | |
|---|---|---|---|
| d77f227cf5 |
12 changed files with 112 additions and 109 deletions
|
|
@ -1,4 +1,5 @@
|
|||
{...}: {
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./gnome
|
||||
];
|
||||
|
|
|
|||
83
flake.lock
generated
83
flake.lock
generated
|
|
@ -162,6 +162,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
|
|
@ -260,11 +276,11 @@
|
|||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -472,11 +488,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741035361,
|
||||
"narHash": "sha256-WSfqkzWUY8FMFnaGm0n9QcoO0cgqJbYcv3ccfkFv7Qw=",
|
||||
"lastModified": 1740614171,
|
||||
"narHash": "sha256-M4V9mn/XlGaz0ghcAICZZ5ErU7gB/J4dRGZ5eC9axng=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "d7e7a292613a4f20218074ff8299dff099a80098",
|
||||
"rev": "d5920bc5da75b8eaf3476bc814bd46d225709788",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -941,11 +957,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741053056,
|
||||
"narHash": "sha256-ygah91MEXq8f82EbqGMk8VTnV2Ur2zFBUnj/0E3yfug=",
|
||||
"lastModified": 1740620959,
|
||||
"narHash": "sha256-2yp4ipvKG1cZf4OJYelOiDMtZ4qxGn4PPFXlpiVMcuo=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "df6064e16c85263e587f0490aa804f67fbc224ff",
|
||||
"rev": "91ee2f20fe2500359ba04f6ca86d39e950345d1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -956,17 +972,18 @@
|
|||
},
|
||||
"nix-vscode-extensions": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741126766,
|
||||
"narHash": "sha256-Irgm6XQBenXE+qqE7VfQmmZCACm5DfEaQamshHiIRZY=",
|
||||
"lastModified": 1740655383,
|
||||
"narHash": "sha256-HHb6wtlHWy/CW3oCtOyOQrNnzgtsvwvwM6wAlDvfTec=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "7524932bd3093e551e87103bb72f096a2352500e",
|
||||
"rev": "bcf7577daac02aa1a7dfaddc79324b7c6ca4af81",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1049,11 +1066,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1741010256,
|
||||
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
|
||||
"lastModified": 1740560979,
|
||||
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
|
||||
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1065,11 +1082,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1740932899,
|
||||
"narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
|
||||
"lastModified": 1740463929,
|
||||
"narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
|
||||
"rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1081,11 +1098,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1741010256,
|
||||
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
|
||||
"lastModified": 1740560979,
|
||||
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
|
||||
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1170,11 +1187,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741128337,
|
||||
"narHash": "sha256-tnzgx8XmDr/jetKbELktR7kCrWyHWs99yOL6PDZV8fM=",
|
||||
"lastModified": 1740661727,
|
||||
"narHash": "sha256-FayYwfyYLL+EtaRcN2H3YV8Z0XJhjYRvhOYPpq7k9NA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "862010e51dce8bc528188b0ad116fa07141da92b",
|
||||
"rev": "32eb8668e5b3de02c6d5891ee1736c2ab35148f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1194,11 +1211,11 @@
|
|||
"systems": "systems_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741120430,
|
||||
"narHash": "sha256-n+Qeb9qU+olGrGcAPcpTccb0zUQscH69o58ncHg2Ufg=",
|
||||
"lastModified": 1740659022,
|
||||
"narHash": "sha256-eUbuxeOQFKZln1ctHDgJDyRzvEK8XkjG6pMVkONQEBA=",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"rev": "27978c7186b26e78c7765de4c093a816617f9f39",
|
||||
"rev": "7e53fc47243448fdd01adf2a5b780831853c5dca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1413,11 +1430,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741043164,
|
||||
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
|
||||
"lastModified": 1739262228,
|
||||
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
|
||||
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1569,11 +1586,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741057234,
|
||||
"narHash": "sha256-1UEFyD9WxJUSECyEzKwM4AQ6BRFVVkrBjfGAUySV80Q=",
|
||||
"lastModified": 1740628241,
|
||||
"narHash": "sha256-7yzmrdbrw7PzTAeWwEr+r5lmevbSuife4cOJl96Kv7w=",
|
||||
"owner": "budimanjojo",
|
||||
"repo": "talhelper",
|
||||
"rev": "4e593a7d938b5ca18a31d4aa808bb000627ee7f5",
|
||||
"rev": "e23e0e77e3c7c9fb08e0d783a11fa1d92227a70d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@
|
|||
direnv
|
||||
git
|
||||
python3
|
||||
pipx
|
||||
fzf
|
||||
ripgrep
|
||||
lsd
|
||||
|
|
|
|||
|
|
@ -12,25 +12,12 @@ in {
|
|||
|
||||
imports = [inputs.ags.homeManagerModules.default];
|
||||
config = mkIf cfg.enable {
|
||||
# Downloads the Theme Resources
|
||||
home.packages = with pkgs; [
|
||||
andromeda-gtk-theme
|
||||
flat-remix-icon-theme
|
||||
bibata-cursors
|
||||
];
|
||||
# 'Installs' (sym-links) the Theme Resources
|
||||
home.file = {
|
||||
".themes/Andromeda".source = "${pkgs.andromeda-gtk-theme}/share/themes/Andromeda";
|
||||
".icons/Flat-Remix-Blue-Dark".source = "${pkgs.flat-remix-icon-theme}/share/icons/Flat-Remix-Blue-Dark";
|
||||
".icons/Bibata-Modern-Ice".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Ice";
|
||||
};
|
||||
# Theme settings
|
||||
gtk = {
|
||||
enable = true;
|
||||
# Some apps just need the good ol' ini files.
|
||||
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
gtk-theme-name = "Andromeda";
|
||||
gtk-theme-name = "Andromeda-dark";
|
||||
gtk-icon-theme-name = "Flat-Remix-Blue-Dark";
|
||||
gtk-font-name = "Fira Code Semi-Bold 14";
|
||||
gtk-cursor-theme-name = "Bibata-Modern-Ice";
|
||||
|
|
@ -48,7 +35,7 @@ in {
|
|||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = "1";
|
||||
gtk-theme-name = "Andromeda";
|
||||
gtk-theme-name = "Andromeda-dark";
|
||||
gtk-icon-theme-name = "Flat-Remix-Blue-Dark";
|
||||
gtk-font-name = "Fira Code Semi-Bold 14";
|
||||
gtk-cursor-theme-name = "Bibata-Modern-Ice";
|
||||
|
|
@ -65,18 +52,9 @@ in {
|
|||
gtk-xft-rgba = "rgb";
|
||||
};
|
||||
};
|
||||
# Wayland and apps pull from dconf since we're using the gtk portal.
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
cursor-size = 24;
|
||||
cursor-theme = "Bibata-Modern-Ice";
|
||||
gtk-theme = "Andromeda";
|
||||
icon-theme = "Flat-Remix-Blue-Dark";
|
||||
};
|
||||
};
|
||||
programs.ags = {
|
||||
enable = true;
|
||||
|
||||
# I don't want Home Manager to manage these config files.
|
||||
# Just setup the programs.
|
||||
configDir = null;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,53 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
myPkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
hypr-pkgs = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
imports = [];
|
||||
swapDevices = [];
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
# System packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
# myPkgs.modrinth-app-unwrapped
|
||||
dconf-editor
|
||||
uv
|
||||
fastfetch
|
||||
gtk3
|
||||
nodejs_22
|
||||
pavucontrol # Pulseaudio volume control
|
||||
vesktop # Discord custom client
|
||||
dconf-editor
|
||||
# myPkgs.modrinth-app-unwrapped
|
||||
zulu # Java OpenJDK
|
||||
nodejs_22
|
||||
vesktop
|
||||
];
|
||||
|
||||
hardware.graphics = {
|
||||
package = hypr-pkgs.mesa.drivers;
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
# Wayland and Chromium/Electron apps.
|
||||
NIXOS_OZONE_WL = "1";
|
||||
};
|
||||
|
||||
# sops
|
||||
# sops.secrets = {
|
||||
# "syncthing/publicCert" = {
|
||||
# sopsFile = ./secrets.sops.yaml;
|
||||
# owner = "jahanson";
|
||||
# mode = "400";
|
||||
# restartUnits = ["syncthing.service"];
|
||||
# };
|
||||
# "syncthing/privateKey" = {
|
||||
# sopsFile = ./secrets.sops.yaml;
|
||||
# owner = "jahanson";
|
||||
# mode = "400";
|
||||
# restartUnits = ["syncthing.service"];
|
||||
# };
|
||||
#};
|
||||
|
||||
services = {
|
||||
# Tailscale
|
||||
tailscale = {
|
||||
|
|
@ -30,19 +58,8 @@
|
|||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
jack.enable = true;
|
||||
pulse.enable = true;
|
||||
extraConfig.pipewire = {
|
||||
"10-clock-rate" = {
|
||||
"context.properties" = {
|
||||
"default.clock.rate" = 48000;
|
||||
};
|
||||
};
|
||||
"10-clock-quantum" = {
|
||||
"context.properties" = {
|
||||
"default.clock.quantum" = 1024;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
blueman.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ with lib; rec {
|
|||
# Create custom package set
|
||||
mkMyPkgs = pkgs: {
|
||||
borgmatic = pkgs.callPackage ../../nixos/packages/borgmatic {};
|
||||
mods = pkgs.callPackage ../../nixos/packages/charm-mods {};
|
||||
# modrinth-app-unwrapped = pkgs.callPackage ../../nixos/packages/modrinth {};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
with lib; let
|
||||
app = "scrypted";
|
||||
# renovate: depName=ghcr.io/koush/scrypted datasource=docker versioning=docker
|
||||
version = "v0.138.6-noble-nvidia";
|
||||
version = "v0.138.5-noble-nvidia";
|
||||
image = "ghcr.io/koush/scrypted:${version}";
|
||||
cfg = config.mySystem.containers.${app};
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
...
|
||||
}: let
|
||||
cfg = config.mySystem.de.hyprland;
|
||||
hypr-pkgs = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
options = {
|
||||
mySystem.de.hyprland = {
|
||||
|
|
@ -18,12 +17,6 @@ in {
|
|||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
# We need all hyprland packages to follow the same MESA version
|
||||
hardware = {
|
||||
graphics = {
|
||||
package = hypr-pkgs.mesa.drivers;
|
||||
};
|
||||
};
|
||||
# Hyprland nixpkgs system packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Hyprland
|
||||
|
|
|
|||
|
|
@ -7,19 +7,20 @@
|
|||
testers,
|
||||
mods,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mods";
|
||||
version = "1.7.0";
|
||||
commitHash = "bf8337f9f4c586aaa267f8019ac2d0daa3b30129";
|
||||
version = "1.6.0";
|
||||
commitHash = "2a7f9d4dc11b6c828bf35a0b3d0be709f3ed79b9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "mods";
|
||||
rev = commitHash;
|
||||
hash = "sha256-EoDia+7ObtpnTDjJMzOk9djyCrW0m9pIToNHEDZ8Ch8=";
|
||||
hash = "sha256-23gtb8BOx/0c643/paRt7VFHEyMyF4Q4a5b5+a4+kNU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dnKvT3VcvidfDcgJ9FerjtReIOwvRZtJZiBwNx2BEQ8=";
|
||||
vendorHash = "sha256-RV/Nr60BpCLcUL2Yy1Dd2ScwoI0BhGhTb/igCEcJPjI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
{inputs, ...}: let
|
||||
{ inputs, ... }:
|
||||
let
|
||||
# smartmontoolsOverlay = import ./smartmontools { };
|
||||
# vivaldiOverlay = self: super: { vivaldi = super.callPackage ./vivaldi { }; };
|
||||
coderOverlay = self: super: { coder = super.callPackage ./coder { }; };
|
||||
# modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; };
|
||||
modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; };
|
||||
termiusOverlay = self: super: { termius = super.callPackage ./termius { }; };
|
||||
in {
|
||||
in
|
||||
{
|
||||
# smartmontools = smartmontoolsOverlay;
|
||||
# vivaldi = vivaldiOverlay;
|
||||
coder = coderOverlay;
|
||||
comm-packages = inputs.nix-vscode-extensions.overlays.default;
|
||||
# mods = modsOverlay;
|
||||
mods = modsOverlay;
|
||||
nix-minecraft = inputs.nix-minecraft.overlay;
|
||||
nur = inputs.nur.overlays.default;
|
||||
termius = termiusOverlay;
|
||||
|
|
@ -25,8 +27,7 @@ in {
|
|||
// {
|
||||
# Add talosctl to the unstable set
|
||||
talosctl = final.unstable.callPackage ./talosctl {
|
||||
inherit
|
||||
(final.unstable)
|
||||
inherit (final.unstable)
|
||||
lib
|
||||
buildGoModule
|
||||
fetchFromGitHub
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
myPkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
|
@ -29,7 +28,6 @@
|
|||
alejandra
|
||||
|
||||
# dev
|
||||
uv # python package manager
|
||||
bash-language-server
|
||||
fd
|
||||
gh
|
||||
|
|
@ -59,8 +57,8 @@
|
|||
inputs.talhelper.packages.${pkgs.system}.default
|
||||
|
||||
# charmbracelet tools
|
||||
myPkgs.mods
|
||||
gum
|
||||
mods
|
||||
skate
|
||||
soft-serve
|
||||
unstable.glow
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue