mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2024-11-15 05:13:10 +01:00
Compare commits
No commits in common. "f4fc1ccdf3fb48e9fdd550947215afb7c418888c" and "11b11c2be7547257cd75e3593e17d0998dfd5009" have entirely different histories.
f4fc1ccdf3
...
11b11c2be7
46
flake.lock
46
flake.lock
|
@ -180,11 +180,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708806879,
|
"lastModified": 1708031129,
|
||||||
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
|
"narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
|
"rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -202,24 +202,24 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706522977,
|
"lastModified": 1706522977,
|
||||||
"narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=",
|
"narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=",
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "TruckSimulatorBot-images",
|
"repo": "TruckSimulatorBot-images",
|
||||||
"rev": "d54a772d48a329a402433cc90502700a6699008e",
|
"rev": "d54a772d48a329a402433cc90502700a6699008e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "TruckSimulatorBot-images",
|
"repo": "TruckSimulatorBot-images",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708968331,
|
"lastModified": 1706639736,
|
||||||
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
|
"narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "impermanence",
|
"repo": "impermanence",
|
||||||
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
|
"rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -281,11 +281,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708830466,
|
"lastModified": 1708225687,
|
||||||
"narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
|
"narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
|
"rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -296,11 +296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708807242,
|
"lastModified": 1708118438,
|
||||||
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
|
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
|
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -349,13 +349,13 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698315015,
|
"lastModified": 1698315015,
|
||||||
"narHash": "sha256-RWYymaHHx6pi4HRLfJJTF3u4Im22uUtVZDUvTbP0Qrc=",
|
"narHash": "sha256-RWYymaHHx6pi4HRLfJJTF3u4Im22uUtVZDUvTbP0Qrc=",
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "pfersel",
|
"repo": "pfersel",
|
||||||
"rev": "40292aa59ed9f6630dc39405f318842a9c8e7cb3",
|
"rev": "40292aa59ed9f6630dc39405f318842a9c8e7cb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "pfersel",
|
"repo": "pfersel",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -400,13 +400,13 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706780558,
|
"lastModified": 1706780558,
|
||||||
"narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=",
|
"narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=",
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "purge",
|
"repo": "purge",
|
||||||
"rev": "3875053bd588aeee14849c50c60f6a33ac784da3",
|
"rev": "3875053bd588aeee14849c50c60f6a33ac784da3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "purge",
|
"repo": "purge",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -488,15 +488,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708375524,
|
"lastModified": 1706780552,
|
||||||
"narHash": "sha256-6XxKJhGupxakfrz8GBJJ/l9RvLs3tt9wuj3c8MZoSuo=",
|
"narHash": "sha256-qXEAZNReY2jeoxLO/uZmZMOEOQq6BRq/Mh20BQGF2Bs=",
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "TruckSimulatorBot",
|
"repo": "TruckSimulatorBot",
|
||||||
"rev": "6b33532486100f83fc9c7f2da3d1b54ea4fe5986",
|
"rev": "88194a54c984fb91090c00d116c821627af9ed2f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "rouven0",
|
"owner": "therealr5",
|
||||||
"repo": "TruckSimulatorBot",
|
"repo": "TruckSimulatorBot",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,15 +26,15 @@
|
||||||
nix-colors.url = "github:Misterio77/nix-colors";
|
nix-colors.url = "github:Misterio77/nix-colors";
|
||||||
|
|
||||||
purge = {
|
purge = {
|
||||||
url = "github:rouven0/purge";
|
url = "github:therealr5/purge";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
trucksimulatorbot = {
|
trucksimulatorbot = {
|
||||||
url = "github:rouven0/TruckSimulatorBot";
|
url = "github:therealr5/TruckSimulatorBot";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
pfersel = {
|
pfersel = {
|
||||||
url = "github:rouven0/pfersel";
|
url = "github:therealr5/pfersel";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -122,10 +122,6 @@ in
|
||||||
auto = "create";
|
auto = "create";
|
||||||
specialUse = "Trash";
|
specialUse = "Trash";
|
||||||
};
|
};
|
||||||
Archive = {
|
|
||||||
auto = "no";
|
|
||||||
specialUse = "Archive";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
pkgs.dovecot_pigeonhole
|
pkgs.dovecot_pigeonhole
|
||||||
|
|
|
@ -8,14 +8,17 @@ let
|
||||||
inherit (prev) python3Packages;
|
inherit (prev) python3Packages;
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
|
pcmanfm = prev.pcmanfm.overrideAttrs (_: {
|
||||||
|
# remove deskop preferences shortcut
|
||||||
|
postInstall = ''
|
||||||
|
rm $out/share/applications/pcmanfm-desktop-pref.desktop
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
|
||||||
pww = callPackage ../pkgs/pww { };
|
pww = callPackage ../pkgs/pww { };
|
||||||
ianny = callPackage ../pkgs/ianny { };
|
ianny = callPackage ../pkgs/ianny { };
|
||||||
|
|
||||||
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
||||||
imv = prev.imv.override {
|
|
||||||
# freeimage is broken
|
|
||||||
withBackends = [ "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
||||||
jmri = callPackage ../pkgs/jmri { };
|
jmri = callPackage ../pkgs/jmri { };
|
||||||
|
|
|
@ -6,16 +6,15 @@
|
||||||
nixpkgs.flake = nixpkgs;
|
nixpkgs.flake = nixpkgs;
|
||||||
};
|
};
|
||||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||||
|
# keep build-time deps around for offline-rebuilding
|
||||||
settings = {
|
settings = {
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
|
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://cache.rfive.de"
|
"https://cache.rfive.de"
|
||||||
"https://cache.ifsr.de"
|
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
|
"cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
|
||||||
"cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
programs = {
|
|
||||||
aerc = {
|
|
||||||
enable = true;
|
|
||||||
extraConfig = {
|
|
||||||
# general = {
|
|
||||||
# unsafe-accounts-conf = true;
|
|
||||||
# };
|
|
||||||
ui = {
|
|
||||||
sort = "date";
|
|
||||||
dirlist-tree = true;
|
|
||||||
fuzzy-complete = true;
|
|
||||||
styleset-name = "dracula";
|
|
||||||
threading-enabled = true;
|
|
||||||
icon-encrypted = "";
|
|
||||||
icon-signed = "";
|
|
||||||
icon-unknown = "";
|
|
||||||
icon-attachment = "";
|
|
||||||
icon-new = "";
|
|
||||||
icon-old = "";
|
|
||||||
icon-replied = "";
|
|
||||||
icon-marked = "";
|
|
||||||
icon-flagged = "";
|
|
||||||
icon-deleted = "";
|
|
||||||
};
|
|
||||||
filters = {
|
|
||||||
"text/plain" = "colorize";
|
|
||||||
"text/html" = "html | colorize";
|
|
||||||
"message/delivery-status" = "colorize";
|
|
||||||
"message/rfc822" = "colorize";
|
|
||||||
"text/calendar" = "calendar";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./aerc
|
|
||||||
./foot
|
./foot
|
||||||
./git
|
./git
|
||||||
./gpg
|
./gpg
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
zip
|
zip
|
||||||
unzip
|
unzip
|
||||||
man-pages
|
man-pages
|
||||||
cinnamon.nemo
|
pcmanfm
|
||||||
xdg-utils # used for xdg-open
|
xdg-utils # used for xdg-open
|
||||||
appimage-run
|
appimage-run
|
||||||
seafile-client
|
seafile-client
|
||||||
|
@ -42,7 +42,6 @@
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
|
|
||||||
# misc
|
# misc
|
||||||
hugo
|
|
||||||
neofetch # obligatory
|
neofetch # obligatory
|
||||||
jetbrains.idea-ultimate #😎
|
jetbrains.idea-ultimate #😎
|
||||||
croc # send files anywhere
|
croc # send files anywhere
|
||||||
|
|
|
@ -4,12 +4,13 @@
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
# package = hyprland.packages.x86_64-linux.waybar-hyprland;
|
||||||
settings = {
|
settings = {
|
||||||
mainBar = {
|
mainBar = {
|
||||||
layer = "top";
|
layer = "top";
|
||||||
position = "top";
|
position = "top";
|
||||||
height = 26;
|
height = 26;
|
||||||
modules-left = [ "sway/workspaces" "river/tags" "river/window" ];
|
modules-left = [ "sway/workspaces" "river/tags" "custom/spotifytitle" "river/window" ];
|
||||||
modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
|
modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
|
||||||
network = {
|
network = {
|
||||||
format-wifi = " {essid} ({signalStrength}%)";
|
format-wifi = " {essid} ({signalStrength}%)";
|
||||||
|
@ -53,6 +54,12 @@
|
||||||
escape = true;
|
escape = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
"custom/spotifytitle" = {
|
||||||
|
format = " {}";
|
||||||
|
max-length = 80;
|
||||||
|
return-type = "json";
|
||||||
|
exec = "${lib.getExe pkgs.pww} -w spotifyd:title -p None 2> /dev/null";
|
||||||
|
};
|
||||||
cpu = {
|
cpu = {
|
||||||
format = "{usage}% ";
|
format = "{usage}% ";
|
||||||
};
|
};
|
||||||
|
@ -131,6 +138,7 @@
|
||||||
background-color: #eb4d4b;
|
background-color: #eb4d4b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#custom-spotifytitle,
|
||||||
#custom-notification,
|
#custom-notification,
|
||||||
#clock,
|
#clock,
|
||||||
#battery,
|
#battery,
|
||||||
|
@ -160,6 +168,19 @@
|
||||||
background-color: #${config.colorScheme.palette.base00};
|
background-color: #${config.colorScheme.palette.base00};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#custom-spotifytitle {
|
||||||
|
background: #1db954;
|
||||||
|
color: #191414;
|
||||||
|
opacity: 1;
|
||||||
|
transition-property: opacity;
|
||||||
|
transition-duration: 0.25s;
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-spotifytitle.Paused,
|
||||||
|
#custom-spotifytitle.Inactive {
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
#battery {
|
#battery {
|
||||||
background-color: #${config.colorScheme.palette.base02};
|
background-color: #${config.colorScheme.palette.base02};
|
||||||
color: #${config.colorScheme.palette.base05};
|
color: #${config.colorScheme.palette.base05};
|
||||||
|
@ -209,5 +230,6 @@
|
||||||
background-color: #${config.colorScheme.palette.base01};
|
background-color: #${config.colorScheme.palette.base01};
|
||||||
color: #${config.colorScheme.palette.base05};
|
color: #${config.colorScheme.palette.base05};
|
||||||
}
|
}
|
||||||
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue