Compare commits
No commits in common. "main" and "sops" have entirely different histories.
77
flake.lock
77
flake.lock
|
@ -73,22 +73,6 @@
|
|||
"url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
|
||||
}
|
||||
},
|
||||
"contador-da-viagem": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742610036,
|
||||
"narHash": "sha256-sY1iheemazmIVJAnoFtut6cN7HX/C5OMDY54UrmCoqE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "efe5ac4a16de7f78824ac89dc987ef635afa5267",
|
||||
"revCount": 4,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/contador-da-viagem"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/contador-da-viagem"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
@ -225,11 +209,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741786315,
|
||||
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
|
||||
"lastModified": 1740485968,
|
||||
"narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
|
||||
"rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -243,11 +227,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742179690,
|
||||
"narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=",
|
||||
"lastModified": 1739502527,
|
||||
"narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=",
|
||||
"owner": "lelgenio",
|
||||
"repo": "dzgui-nix",
|
||||
"rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4",
|
||||
"rev": "06fcea9445b5a005b40469a69f57f2147398bc94",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -456,11 +440,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742655702,
|
||||
"narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
|
||||
"lastModified": 1739757849,
|
||||
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
|
||||
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -497,11 +481,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742701275,
|
||||
"narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
|
||||
"lastModified": 1740281615,
|
||||
"narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
|
||||
"rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -520,11 +504,11 @@
|
|||
"nixpkgs-24_11": "nixpkgs-24_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742413977,
|
||||
"narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
|
||||
"lastModified": 1740437053,
|
||||
"narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
|
||||
"rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
@ -567,11 +551,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1743095683,
|
||||
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
|
||||
"lastModified": 1740560979,
|
||||
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
|
||||
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -628,11 +612,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1742937945,
|
||||
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
|
||||
"lastModified": 1740603184,
|
||||
"narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
|
||||
"rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -725,7 +709,6 @@
|
|||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"catboy-spinner": "catboy-spinner",
|
||||
"contador-da-viagem": "contador-da-viagem",
|
||||
"demoji": "demoji",
|
||||
"dhist": "dhist",
|
||||
"disko": "disko",
|
||||
|
@ -800,11 +783,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742700801,
|
||||
"narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
|
||||
"lastModified": 1741043164,
|
||||
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
|
||||
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -960,11 +943,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743081648,
|
||||
"narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
|
||||
"lastModified": 1739829690,
|
||||
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
|
||||
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -975,11 +958,11 @@
|
|||
},
|
||||
"vpsadminos": {
|
||||
"locked": {
|
||||
"lastModified": 1743047409,
|
||||
"narHash": "sha256-WTUW2GZqHknVwEbzF/TeX2eg52414gfl6hXloDDwEsQ=",
|
||||
"lastModified": 1740754923,
|
||||
"narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=",
|
||||
"owner": "vpsfreecz",
|
||||
"repo": "vpsadminos",
|
||||
"rev": "cf9324b9ff855172bd9de8aa3b8215071c4a0c6f",
|
||||
"rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -56,10 +56,6 @@
|
|||
wl-crosshair.url = "github:lelgenio/wl-crosshair";
|
||||
warthunder-leak-counter.url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
|
||||
made-you-look.url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
|
||||
contador-da-viagem = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/contador-da-viagem";
|
||||
flake = false;
|
||||
};
|
||||
catboy-spinner = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
|
||||
flake = false;
|
||||
|
|
|
@ -19,8 +19,6 @@ in
|
|||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
my.nix-ld.enable = true;
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
|
|
|
@ -18,7 +18,7 @@ in
|
|||
|
||||
systemd.services.amd-fan-control = {
|
||||
script = ''
|
||||
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 90 0 80
|
||||
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
|
||||
'';
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
|
|
|
@ -42,7 +42,6 @@ in
|
|||
};
|
||||
|
||||
my.gaming.enable = true;
|
||||
my.nix-ld.enable = true;
|
||||
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
||||
|
||||
|
|
|
@ -23,12 +23,11 @@
|
|||
systemd.services.factorio-backup-save = {
|
||||
description = "Backup factorio saves";
|
||||
script = ''
|
||||
FILENAME="space-age-$(date --iso=seconds | tr ':' '_').zip"
|
||||
${lib.getExe pkgs.rsync} \
|
||||
-av \
|
||||
--chown=lelgenio \
|
||||
/var/lib/factorio/saves/default.zip \
|
||||
~lelgenio/Documentos/GameSaves/factorio_saves/$FILENAME
|
||||
~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip
|
||||
'';
|
||||
serviceConfig.Type = "oneshot";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
|
@ -43,9 +43,4 @@
|
|||
forceSSL = true;
|
||||
root = inputs.hello-fonts;
|
||||
};
|
||||
services.nginx.virtualHosts."contador-da-viagem.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = inputs.contador-da-viagem;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
options = [ "nofail" ];
|
||||
};
|
||||
fileSystems."/var/lib/mastodon" = {
|
||||
device = "172.16.131.19:/nas/5749/mastodon";
|
||||
device = "172.16.130.7:/nas/5749/mastodon";
|
||||
fsType = "nfs";
|
||||
options = [ "nofail" ];
|
||||
};
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ factorio-headless, pkgs }:
|
||||
|
||||
factorio-headless.overrideAttrs (_: rec {
|
||||
version = "2.0.39";
|
||||
version = "2.0.32";
|
||||
src = pkgs.fetchurl {
|
||||
name = "factorio_headless_x64-${version}.tar.xz";
|
||||
url = "https://www.factorio.com/get-download/${version}/headless/linux64";
|
||||
hash = "sha256-D4o9DkN5e1/02LhdfDNLCVo/B9mqf4Cx6H+Uk5qT3zQ=";
|
||||
hash = "sha256-KmECrkLcxej+kjvWi80yalaeNZEqzeEhMB5dTS2FZBc=";
|
||||
};
|
||||
})
|
||||
|
|
|
@ -39,31 +39,10 @@ if [ -z "$TEMP_MAX" ];then
|
|||
bail "No maximum temperature provided"
|
||||
fi
|
||||
|
||||
PWM_MIN_PCT="$4"
|
||||
PWM_MAX_PCT="$5"
|
||||
|
||||
if [ -z "$PWM_MIN_PCT" ];then
|
||||
bail "No minimum fan speed % not provided"
|
||||
fi
|
||||
|
||||
if [ -z "$PWM_MAX_PCT" ];then
|
||||
bail "No maximum fan speed % not provided"
|
||||
fi
|
||||
|
||||
PWM_MIN="$(( $PWM_MIN_PCT * 255 / 100))"
|
||||
PWM_MAX="$(( $PWM_MAX_PCT * 255 / 100))"
|
||||
PWM_MIN=0
|
||||
PWM_MAX=255
|
||||
|
||||
echo "Running..." >&2
|
||||
|
||||
echo "TEMP_MIN=$TEMP_MIN°C"
|
||||
echo "TEMP_MAX=$TEMP_MAX°C"
|
||||
echo "FAN_MIN=$PWM_MIN_PCT%"
|
||||
echo "FAN_MAX=$PWM_MAX_PCT%"
|
||||
|
||||
echo 1 > "$HWMON/pwm1_enable"
|
||||
|
||||
PREV=0
|
||||
|
||||
while true; do
|
||||
TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
|
||||
TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
|
||||
|
@ -76,11 +55,7 @@ while true; do
|
|||
PWM=$PWM_MIN
|
||||
fi
|
||||
|
||||
AVG="$(( ($PWM * 20 + $PREV * 80) / 100 ))"
|
||||
|
||||
echo "$AVG"
|
||||
|
||||
echo "$AVG" > "$HWMON/pwm1"
|
||||
PREV="$AVG"
|
||||
echo 1 > "$HWMON/pwm1_enable"
|
||||
echo "$PWM" > "$HWMON/pwm1"
|
||||
sleep .1s
|
||||
done
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
./locale.nix
|
||||
./users.nix
|
||||
./containers.nix
|
||||
./nix-ld.nix
|
||||
./network.nix
|
||||
../settings
|
||||
];
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
config = lib.mkIf config.my.containers.enable {
|
||||
services.flatpak.enable = true;
|
||||
programs.appimage.enable = true;
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.nix-ld.enable = lib.mkEnableOption { };
|
||||
|
||||
config = lib.mkIf (config.my.nix-ld.enable) {
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries =
|
||||
with pkgs;
|
||||
# run appimages + linux games natively
|
||||
[ fuse ]
|
||||
++ (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
|
||||
++ (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
options.my = {
|
||||
nix-ld.enable = lib.mkEnableOption { };
|
||||
android.enable = lib.mkEnableOption { };
|
||||
media-packages.enable = lib.mkEnableOption { };
|
||||
containers.enable = lib.mkEnableOption { };
|
||||
|
|
|
@ -2,22 +2,15 @@
|
|||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
font,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (config.my) desktop;
|
||||
inherit (config.my.theme) color;
|
||||
|
||||
inherit (config.my) desktop browser;
|
||||
bugfixedFirefox = pkgs.firefox-devedition-unwrapped // {
|
||||
requireSigning = false;
|
||||
allowAddonSideload = true;
|
||||
};
|
||||
|
||||
swayCustomization = ''
|
||||
#titlebar { display: none !important; }
|
||||
#TabsToolbar { display: none !important; }
|
||||
#sidebar-header { display: none !important; }
|
||||
'';
|
||||
in
|
||||
{
|
||||
config = {
|
||||
|
@ -114,6 +107,8 @@ in
|
|||
"media.ffmpeg.vaapi.enabled" = true;
|
||||
"media.ffvpx.enabled" = true;
|
||||
|
||||
"gfx.webrender.all" = true;
|
||||
|
||||
# Enable installing non signed extensions
|
||||
"extensions.langpacks.signatures.required" = false;
|
||||
"xpinstall.signatures.required" = false;
|
||||
|
@ -124,17 +119,54 @@ in
|
|||
"devtools.chrome.enabled" = true;
|
||||
"devtools.debugger.remote-enabled" = true;
|
||||
};
|
||||
userChrome = ''
|
||||
${lib.optionalString (desktop == "sway") swayCustomization}
|
||||
userChrome =
|
||||
if desktop == "sway" then
|
||||
''
|
||||
#titlebar { display: none !important; }
|
||||
#TabsToolbar { display: none !important; }
|
||||
#sidebar-header { display: none !important; }
|
||||
''
|
||||
else
|
||||
''
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#sidebar-main {
|
||||
background-color: ${color.bg};
|
||||
}
|
||||
#navigator-toolbox {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 50px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#tabbrowser-tabbox {
|
||||
outline-width: 0 !important;
|
||||
}
|
||||
'';
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#nav-bar {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
grid-column: 1 / 3;
|
||||
grid-row: 1;
|
||||
z-index: 0;
|
||||
padding-right: 29px !important;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
.toolbar-items {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#TabsToolbar {
|
||||
max-width: 50px;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#titlebar {
|
||||
max-width: 50px;
|
||||
grid-area: 1 / 2;
|
||||
z-index: 10;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -143,5 +175,9 @@ in
|
|||
exec firefox
|
||||
'';
|
||||
};
|
||||
home.sessionVariables = {
|
||||
MOZ_ENABLE_WAYLAND = "1";
|
||||
MOZ_DISABLE_RDD_SANDBOX = "1";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
37
user/git.nix
37
user/git.nix
|
@ -16,46 +16,17 @@ in
|
|||
user = {
|
||||
name = username;
|
||||
email = mail.personal.user;
|
||||
signingkey = "2F8F21CE8721456B";
|
||||
};
|
||||
init.defaultBranch = "main";
|
||||
core = {
|
||||
fsmonitor = true;
|
||||
untrackedCache = true;
|
||||
};
|
||||
commit = {
|
||||
verbose = true;
|
||||
gpgsign = true;
|
||||
};
|
||||
fetch = {
|
||||
prune = true;
|
||||
pruneTags = true;
|
||||
all = true;
|
||||
};
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
default = "simple";
|
||||
followTags = true;
|
||||
};
|
||||
commit.verbose = true;
|
||||
push.autoSetupRemote = true;
|
||||
pull.rebase = true;
|
||||
tag.sort = "version:refname";
|
||||
merge.conflictStyle = "zdiff3";
|
||||
rerere = {
|
||||
enabled = true;
|
||||
autoupdate = true;
|
||||
};
|
||||
branch.sort = "-committerdate";
|
||||
diff = {
|
||||
algorithm = "histogram";
|
||||
colorMoved = "plain";
|
||||
mnemonicPrefix = true;
|
||||
renames = true;
|
||||
};
|
||||
merge.conflictStyle = "diff3";
|
||||
rerere.enabled = true;
|
||||
rebase = {
|
||||
abbreviateCommands = true;
|
||||
autoSquash = true;
|
||||
autoStash = true;
|
||||
updateRefs = true;
|
||||
};
|
||||
pager = {
|
||||
log = "${pkgs._diffr}/bin/_diffr | ${pkgs.kak-pager}/bin/kak-pager";
|
||||
|
|
|
@ -35,7 +35,6 @@ lib.mkIf (config.my.desktop == "gnome") {
|
|||
amberol
|
||||
pitivi
|
||||
keepassxc
|
||||
menulibre
|
||||
|
||||
libsForQt5.qt5ct
|
||||
libsForQt5.qtstyleplugin-kvantum
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
systemd.user.services.home-manager-expire = {
|
||||
Unit = {
|
||||
Description = "Remove old home-manager generations";
|
||||
};
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart = pkgs.writeShellScript "home-manager-expire" ''
|
||||
${lib.getExe pkgs.home-manager} expire-generations 7d
|
||||
'';
|
||||
};
|
||||
};
|
||||
systemd.user.timers.home-manager-expire = {
|
||||
Unit = {
|
||||
Description = "Remove old home-manager generations";
|
||||
};
|
||||
Timer = {
|
||||
OnCalendar = "daily";
|
||||
Unit = "home-manager-expire.service";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "timers.target" ];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -9,7 +9,6 @@
|
|||
{
|
||||
imports = [
|
||||
./dummy.nix
|
||||
./home-manager.nix
|
||||
./waybar
|
||||
./helix.nix
|
||||
./kakoune
|
||||
|
@ -45,7 +44,6 @@
|
|||
inputs.nix-index-database.hmModules.nix-index
|
||||
../settings
|
||||
./powerplay-led-idle.nix
|
||||
./rm-target.nix
|
||||
];
|
||||
|
||||
my = import ./variables.nix // {
|
||||
|
@ -59,6 +57,8 @@
|
|||
home.username = "lelgenio";
|
||||
home.homeDirectory = "/home/lelgenio";
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
terminal
|
||||
|
||||
|
@ -169,6 +169,30 @@
|
|||
exec nicotine
|
||||
'';
|
||||
|
||||
systemd.user.services.rm-target = {
|
||||
Unit = {
|
||||
Description = "Remove directories named 'target'";
|
||||
};
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart = pkgs.writeShellScript "rm-target" ''
|
||||
sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf --
|
||||
'';
|
||||
};
|
||||
};
|
||||
systemd.user.timers.rm-target = {
|
||||
Unit = {
|
||||
Description = "Remove directories named 'target'";
|
||||
};
|
||||
Timer = {
|
||||
OnCalendar = "weekly";
|
||||
Unit = "rm-target.service";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "timers.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
# This value determines the Home Manager release that your
|
||||
# configuration is compatible with. This helps avoid breakage
|
||||
# when a new Home Manager release introduces backwards
|
||||
|
|
|
@ -82,9 +82,6 @@ in
|
|||
rev = "1cc6baeb14b773916eb9209469aa77b3cfa67a0a";
|
||||
sha256 = "sha256-3PLxG9UtT0MMSibvTviXQIgTH3rApZ3WSbNCEH3c7HE=";
|
||||
};
|
||||
buildInputs = with pkgs; [
|
||||
python3Minimal
|
||||
];
|
||||
})
|
||||
];
|
||||
extraConfig =
|
||||
|
|
|
@ -15,14 +15,6 @@ hook global WinSetOption filetype=nix %{
|
|||
set buffer formatcmd 'nixfmt'
|
||||
}
|
||||
|
||||
hook global BufCreate .*\.json %{
|
||||
set buffer formatcmd 'prettier --parser json'
|
||||
}
|
||||
|
||||
hook global BufCreate .*\.ya?ml %{
|
||||
set buffer formatcmd 'prettier --parser yaml'
|
||||
}
|
||||
|
||||
hook global BufCreate .*\.html %{
|
||||
set buffer formatcmd 'prettier --parser html'
|
||||
}
|
||||
|
|
|
@ -27,10 +27,10 @@ set confirm_on_delete multiple
|
|||
# Use non-default path for file preview script?
|
||||
# ranger ships with scope.sh, a script that calls external programs (see
|
||||
# README.md for dependencies) to preview images, archives, etc.
|
||||
# set preview_script ~/.config/ranger/scope.sh
|
||||
set preview_script ~/.config/ranger/scope.sh
|
||||
|
||||
# Use the external preview script or display simple plain text or image previews?
|
||||
# set use_preview_script true
|
||||
set use_preview_script true
|
||||
|
||||
# Automatically count files in the directory, even before entering them?
|
||||
set automatically_count_files true
|
||||
|
@ -40,7 +40,7 @@ set automatically_count_files true
|
|||
set open_all_images true
|
||||
|
||||
# Be aware of version control systems and display information.
|
||||
set vcs_aware false
|
||||
set vcs_aware true
|
||||
|
||||
# State of the four backends git, hg, bzr, svn. The possible states are
|
||||
# disabled, local (only show local info), enabled (show local and remote
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
systemd.user.services.rm-target = {
|
||||
Unit = {
|
||||
Description = "Remove directories named 'target'";
|
||||
};
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart = pkgs.writeShellScript "rm-target" ''
|
||||
sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf --
|
||||
'';
|
||||
};
|
||||
};
|
||||
systemd.user.timers.rm-target = {
|
||||
Unit = {
|
||||
Description = "Remove directories named 'target'";
|
||||
};
|
||||
Timer = {
|
||||
OnCalendar = "weekly";
|
||||
Unit = "rm-target.service";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "timers.target" ];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -20,7 +20,6 @@ in
|
|||
./swayidle.nix
|
||||
./swaylock.nix
|
||||
./theme.nix
|
||||
./gammastep.nix
|
||||
];
|
||||
|
||||
options.my.sway.enable = lib.mkEnableOption { };
|
||||
|
@ -33,7 +32,6 @@ in
|
|||
my.mpd.enable = true;
|
||||
my.zathura.enable = true;
|
||||
my.waybar.enable = true;
|
||||
my.gammastep.enable = true;
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
|
@ -117,6 +115,10 @@ in
|
|||
exec_always systemctl --user restart waybar.service
|
||||
'';
|
||||
};
|
||||
services.gammastep = {
|
||||
enable = true;
|
||||
provider = "geoclue2";
|
||||
};
|
||||
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.gammastep;
|
||||
in
|
||||
{
|
||||
options.my.gammastep.enable = lib.mkEnableOption { };
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.gammastep = {
|
||||
enable = true;
|
||||
dawnTime = "6:00-7:45";
|
||||
duskTime = "18:35-20:15";
|
||||
temperature = {
|
||||
day = 6500;
|
||||
night = 4500;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -9,7 +9,7 @@ in
|
|||
options.my.swaylock.enable = lib.mkEnableOption { };
|
||||
|
||||
config.programs.swaylock.settings = lib.mkIf cfg.enable {
|
||||
image = theme.backgroundPath;
|
||||
image = toString theme.background;
|
||||
font = font.interface;
|
||||
font-size = font.size.medium;
|
||||
indicator-thickness = 20;
|
||||
|
|
|
@ -55,7 +55,7 @@ lib.mkIf (desktop == "sway") {
|
|||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "gtk3";
|
||||
style.name = "kvantum";
|
||||
style.name = "qt5ct";
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
|
@ -70,6 +70,28 @@ lib.mkIf (desktop == "sway") {
|
|||
};
|
||||
};
|
||||
|
||||
# fonts.fontconfig.enable = true;
|
||||
xdg.configFile = {
|
||||
"qt5ct/qt5ct.conf".text = ''
|
||||
[Appearance]
|
||||
# color_scheme_path=/nix/store/f07mk0vrm47jxw3y5v99hxncy0w4vcyq-qt5ct-1.5/share/qt5ct/colors/darker.conf
|
||||
custom_palette=false
|
||||
icon_theme=${icon_theme}
|
||||
standard_dialogs=default
|
||||
style=kvantum-dark
|
||||
|
||||
# [Fonts]
|
||||
# fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
||||
# general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
||||
'';
|
||||
"kdedefaults/kdeglobals".text = ''
|
||||
[General]
|
||||
ColorScheme=BreezeDark
|
||||
|
||||
[Icons]
|
||||
Theme=${icon_theme}
|
||||
'';
|
||||
};
|
||||
services.xsettingsd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
@ -83,6 +105,11 @@ lib.mkIf (desktop == "sway") {
|
|||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
libsForQt5.qt5ct
|
||||
libsForQt5.qtstyleplugin-kvantum
|
||||
qt6Packages.qt6ct
|
||||
qt6Packages.qtstyleplugin-kvantum
|
||||
|
||||
pkgs.bibata-cursors
|
||||
pkgs.orchis_theme_compact
|
||||
pkgs.papirus_red
|
||||
|
|
|
@ -28,7 +28,6 @@ let
|
|||
cursor_theme = "Bibata-Modern-Classic";
|
||||
|
||||
background = ./backgrounds/nixos-dark-pattern.png;
|
||||
backgroundPath = "~/.local/share/backgrounds/nixos-dark-pattern.png";
|
||||
opacity = 95;
|
||||
opacityHex = "ee";
|
||||
color = {
|
||||
|
@ -60,7 +59,6 @@ let
|
|||
cursor_theme = "Bibata-Modern-Classic";
|
||||
|
||||
background = ./backgrounds/nixos-light-pattern.png;
|
||||
backgroundPath = "~/.local/share/backgrounds/nixos-light-pattern.png";
|
||||
opacity = 95;
|
||||
opacityHex = "ee";
|
||||
color = {
|
||||
|
|
Loading…
Reference in a new issue