mirror of
https://github.com/kmein/niveum
synced 2026-03-21 20:31:07 +01:00
Compare commits
8 Commits
89686082d0
...
4c84da9404
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c84da9404 | ||
| ddd759a838 | |||
| 5244ae3850 | |||
| b90aa5ef07 | |||
| d52c10bc84 | |||
| a6bc317141 | |||
| d4ee3cf692 | |||
| c96ac804df |
@@ -6,16 +6,18 @@
|
|||||||
unstablePackages,
|
unstablePackages,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
inherit (lib.strings) makeBinPath;
|
inherit (lib.strings) makeBinPath;
|
||||||
inherit (import ../lib) localAddresses kieran remoteDir;
|
inherit (import ../lib) localAddresses kieran remoteDir;
|
||||||
defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
|
defaultApplications = (import ../lib).defaultApplications { inherit pkgs; };
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.self.nixosModules.system-dependent
|
inputs.self.nixosModules.system-dependent
|
||||||
inputs.self.nixosModules.power-action
|
inputs.self.nixosModules.power-action
|
||||||
{
|
{
|
||||||
boot.supportedFilesystems = ["ntfs"];
|
boot.supportedFilesystems = [ "ntfs" ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
@@ -74,7 +76,10 @@ in {
|
|||||||
hashedPasswordFile = config.age.secrets.kfm-password.path;
|
hashedPasswordFile = config.age.secrets.kfm-password.path;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
uid = 1000;
|
uid = 1000;
|
||||||
extraGroups = ["pipewire" "audio"];
|
extraGroups = [
|
||||||
|
"pipewire"
|
||||||
|
"audio"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.settings.trusted-users = [ config.users.users.me.name ];
|
nix.settings.trusted-users = [ config.users.users.me.name ];
|
||||||
@@ -87,25 +92,27 @@ in {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
environment.interactiveShellInit = "export PATH=$PATH";
|
environment.interactiveShellInit = "export PATH=$PATH";
|
||||||
environment.shellAliases = let
|
environment.shellAliases =
|
||||||
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
let
|
||||||
in {
|
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
||||||
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
in
|
||||||
ns = "nix-shell --run zsh";
|
{
|
||||||
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
||||||
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
ns = "nix-shell --run zsh";
|
||||||
tmux = "${pkgs.tmux}/bin/tmux -2";
|
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
||||||
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
||||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
tmux = "${pkgs.tmux}/bin/tmux -2";
|
||||||
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||||
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
|
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
||||||
};
|
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
||||||
|
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
|
||||||
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "en_DK.UTF-8";
|
defaultLocale = "en_DK.UTF-8";
|
||||||
supportedLocales = ["all"];
|
supportedLocales = [ "all" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -121,12 +128,18 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
greeters.gtk = {
|
greeters.gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
|
indicators = [
|
||||||
|
"~spacer"
|
||||||
|
"~host"
|
||||||
|
"~spacer"
|
||||||
|
"~session"
|
||||||
|
"~power"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{programs.command-not-found.enable = true;}
|
{ programs.command-not-found.enable = true; }
|
||||||
{
|
{
|
||||||
programs.gnupg = {
|
programs.gnupg = {
|
||||||
agent = {
|
agent = {
|
||||||
@@ -141,7 +154,11 @@ in {
|
|||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.gnupg
|
pkgs.gnupg
|
||||||
(pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
|
(pkgs.pass.withExtensions (e: [
|
||||||
|
e.pass-otp
|
||||||
|
e.pass-import
|
||||||
|
e.pass-genphrase
|
||||||
|
]))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -154,12 +171,10 @@ in {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
networking.hosts =
|
networking.hosts = lib.mapAttrs' (name: address: {
|
||||||
lib.mapAttrs' (name: address: {
|
name = address;
|
||||||
name = address;
|
value = [ "${name}.local" ];
|
||||||
value = ["${name}.local"];
|
}) localAddresses;
|
||||||
})
|
|
||||||
localAddresses;
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
home-manager.users.me.home.stateVersion = "22.05";
|
home-manager.users.me.home.stateVersion = "22.05";
|
||||||
@@ -167,9 +182,9 @@ in {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
systemd.user.services.udiskie = {
|
systemd.user.services.udiskie = {
|
||||||
after = ["udisks2.service"];
|
after = [ "udisks2.service" ];
|
||||||
wants = ["udisks2.service"];
|
wants = [ "udisks2.service" ];
|
||||||
wantedBy = ["graphical-session.target"];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
|
ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
|
||||||
};
|
};
|
||||||
@@ -212,7 +227,8 @@ in {
|
|||||||
./keyboard.nix
|
./keyboard.nix
|
||||||
./mycelium.nix
|
./mycelium.nix
|
||||||
./kdeconnect.nix
|
./kdeconnect.nix
|
||||||
{home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose;}
|
{ home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose; }
|
||||||
|
{ services.upower.enable = true; }
|
||||||
./lb.nix
|
./lb.nix
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./mime.nix
|
./mime.nix
|
||||||
@@ -276,7 +292,7 @@ in {
|
|||||||
download = "${config.users.users.me.home}/sync/Downloads";
|
download = "${config.users.users.me.home}/sync/Downloads";
|
||||||
music = "${config.users.users.me.home}/mobile/audio";
|
music = "${config.users.users.me.home}/mobile/audio";
|
||||||
pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
|
pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
|
||||||
publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
|
publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
|
||||||
videos = pictures;
|
videos = pictures;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -131,7 +131,10 @@ in {
|
|||||||
(pkgs.writers.writeDashBin "fu-vpn" ''
|
(pkgs.writers.writeDashBin "fu-vpn" ''
|
||||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
||||||
then
|
then
|
||||||
${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
|
# root firefox will not open login window unless root owns Xauthority
|
||||||
|
sudo cp $XAUTHORITY /root/.Xauthority
|
||||||
|
sudo chown root: /root/.Xauthority
|
||||||
|
XAUTHORITY=/root/.Xauthority sudo ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
|
||||||
fi
|
fi
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -6,10 +6,8 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
dashboard = pkgs.writers.writeDashBin "dashboard" ''
|
dashboard = pkgs.writers.writeDashBin "dashboard" ''
|
||||||
${pkgs.alacritty}/bin/alacritty --class wtf --command ${pkgs.writers.writeDash "dashboard-inner" ''
|
${pkgs.alacritty}/bin/alacritty --option font.size=4 --class dashboard --command ${pkgs.writers.writeDash "dashboard-inner" ''
|
||||||
export WTF_OWM_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
|
exec ${pkgs.procps}/bin/watch -c -n 10 ${niveumPackages.q}/bin/q
|
||||||
export WTF_MINIFLUX_API_KEY="$(cat ${config.age.secrets.miniflux-api-token.path})"
|
|
||||||
exec ${niveumPackages.dashboard}/bin/dashboard
|
|
||||||
''}
|
''}
|
||||||
'';
|
'';
|
||||||
inherit (import ../lib) defaultApplications;
|
inherit (import ../lib) defaultApplications;
|
||||||
@@ -310,7 +308,7 @@ in {
|
|||||||
exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
|
exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
|
||||||
exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
|
exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
|
||||||
|
|
||||||
assign [class="wtf"] ${infoWorkspace}
|
assign [class="dashboard"] ${infoWorkspace}
|
||||||
exec ${dashboard}/bin/dashboard
|
exec ${dashboard}/bin/dashboard
|
||||||
'';
|
'';
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
|
|||||||
@@ -55,7 +55,9 @@
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
block = "battery";
|
block = "battery";
|
||||||
device = config.niveum.batteryName;
|
format = "$icon $percentage $time";
|
||||||
|
device = "DisplayDevice";
|
||||||
|
driver = "upower";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
block = "sound";
|
block = "sound";
|
||||||
|
|||||||
@@ -75,8 +75,8 @@ in {
|
|||||||
user = "kfm";
|
user = "kfm";
|
||||||
port = sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
kibbeh = {
|
kabsa = {
|
||||||
hostname = "kibbeh.r";
|
hostname = "kabsa.r";
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
port = sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
|
|||||||
84
flake.lock
generated
84
flake.lock
generated
@@ -12,11 +12,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745630506,
|
"lastModified": 1747575206,
|
||||||
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
|
"narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
|
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -181,11 +181,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737857314,
|
"lastModified": 1746626503,
|
||||||
"narHash": "sha256-T9THCbnlj4CkKbTP+lisA5PUMoTXE7uh4FyDQzui+dc=",
|
"narHash": "sha256-mRnIdJLP+0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "buildbot-nix",
|
"repo": "buildbot-nix",
|
||||||
"rev": "c077f430f3717d41bb303d031398058665315166",
|
"rev": "7ad9b4886eccb5eecc0686a16266ddabf6cbefe9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -382,11 +382,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736143030,
|
"lastModified": 1743550720,
|
||||||
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
|
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
|
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -611,11 +611,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736917206,
|
"lastModified": 1744693102,
|
||||||
"narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=",
|
"narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "hercules-ci-effects",
|
"repo": "hercules-ci-effects",
|
||||||
"rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425",
|
"rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -654,11 +654,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746171682,
|
"lastModified": 1747688870,
|
||||||
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
|
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "50eee705bbdbac942074a8c120e8194185633675",
|
"rev": "d5f1f641b289553927b3801580598d200a501863",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1109,11 +1109,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable_2": {
|
"nixpkgs-unstable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746886008,
|
"lastModified": 1748134661,
|
||||||
"narHash": "sha256-JtzH3pV0oqlR9lTccOU5SbAY8PzbEp2lyXKlD/DGdRQ=",
|
"narHash": "sha256-p4cM3XaeN7YLMw4dSRCIZwXPxOS1SelqxPBUNs0IF6A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0bb671aaa84205c180ec9122d9aa2f5823b7b2aa",
|
"rev": "81e63461fb905af981fcb99057a845a930999eaa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1231,11 +1231,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746557022,
|
"lastModified": 1747862697,
|
||||||
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
|
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
|
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1247,11 +1247,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746663147,
|
"lastModified": 1748026106,
|
||||||
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
|
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
|
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1263,11 +1263,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737885589,
|
"lastModified": 1746904237,
|
||||||
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
|
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
|
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1395,11 +1395,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746881822,
|
"lastModified": 1748124399,
|
||||||
"narHash": "sha256-+U1n00EyLKzvZlMHK/YGS6OGIYsKfaz4j1qydyyrIRk=",
|
"narHash": "sha256-AWYa6QSgYbd0YiOecaTyJ78XSHcLI7yljdSpBTQWB+8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "887e5be213778cb047379434b6bb41ad09d9c8db",
|
"rev": "d8bccb87461726979bc4fe9facbdfa0739fe24a2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1568,11 +1568,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746844454,
|
"lastModified": 1748054080,
|
||||||
"narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=",
|
"narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "be092436d4c0c303b654e4007453b69c0e33009e",
|
"rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1646,11 +1646,11 @@
|
|||||||
"nixpkgs": "nixpkgs_9"
|
"nixpkgs": "nixpkgs_9"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739285100,
|
"lastModified": 1747157099,
|
||||||
"narHash": "sha256-tQZ8sXCU6yvC0ut/+ezRUSd89Nbyqqn0JVCjYDwcqQA=",
|
"narHash": "sha256-i2s6jU+8GLKVjhWDyvFYxmXI7A44c9p6apPPyKt0ETk=",
|
||||||
"owner": "krebs",
|
"owner": "krebs",
|
||||||
"repo": "stockholm",
|
"repo": "stockholm",
|
||||||
"rev": "8d0538bf86e4f9df4f5cc358a1760b255be797e9",
|
"rev": "d4abc837cc7b87b4f23fe48cc306df26e3de7aab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1712,11 +1712,11 @@
|
|||||||
"tinted-tmux": "tinted-tmux"
|
"tinted-tmux": "tinted-tmux"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746143246,
|
"lastModified": 1747771231,
|
||||||
"narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=",
|
"narHash": "sha256-DYdmj22ZvkN5x9/VtdV5Wnze+UaPuboYraCPnOWn6u4=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "20ace60f9cb5e179cb2256abaee505780df8e804",
|
"rev": "66f554e4e32d804bcf2c007a7b7efef04a3773b0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1977,11 +1977,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737483750,
|
"lastModified": 1746216483,
|
||||||
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
|
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
|
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -395,6 +395,7 @@
|
|||||||
opustags = pkgs.callPackage packages/opustags.nix {};
|
opustags = pkgs.callPackage packages/opustags.nix {};
|
||||||
pls = pkgs.callPackage packages/pls.nix {};
|
pls = pkgs.callPackage packages/pls.nix {};
|
||||||
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
||||||
|
q = pkgs.callPackage packages/q.nix {};
|
||||||
qrpaste = pkgs.callPackage packages/qrpaste.nix {};
|
qrpaste = pkgs.callPackage packages/qrpaste.nix {};
|
||||||
random-zeno = pkgs.callPackage packages/random-zeno.nix {};
|
random-zeno = pkgs.callPackage packages/random-zeno.nix {};
|
||||||
rfc = pkgs.callPackage packages/rfc.nix {};
|
rfc = pkgs.callPackage packages/rfc.nix {};
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
zaatar = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
|
zaatar = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
|
||||||
fatteh = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
|
fatteh = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
|
||||||
ful = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
|
ful = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
|
||||||
kibbeh = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
|
kabsa = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
|
||||||
makanek = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
|
makanek = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
|
||||||
manakish = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
|
manakish = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
|
||||||
}
|
}
|
||||||
|
|||||||
9
packages/q.nix
Normal file
9
packages/q.nix
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{ writers, lib, todoman, khal, util-linux, wego, pass }:
|
||||||
|
writers.writeDashBin "q" ''
|
||||||
|
export PATH=$PATH:${lib.makeBinPath [todoman khal util-linux wego pass]}
|
||||||
|
(todo list --due 240; echo) &
|
||||||
|
(khal list today today; echo) &
|
||||||
|
(cal -3; echo) &
|
||||||
|
(wego -location Berlin -owm-api-key "$(pass api-keys/openweathermap)" -frontend emoji -days 2; echo) &
|
||||||
|
wait
|
||||||
|
''
|
||||||
2
secrets
2
secrets
Submodule secrets updated: c622f9bac9...e14a3170cc
@@ -7,7 +7,7 @@
|
|||||||
inherit (import ../../lib) retiolumAddresses;
|
inherit (import ../../lib) retiolumAddresses;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
../kibbeh/hardware-configuration.nix
|
||||||
../../configs/tlp.nix
|
../../configs/tlp.nix
|
||||||
../../configs/default.nix
|
../../configs/default.nix
|
||||||
../../configs/networkmanager.nix
|
../../configs/networkmanager.nix
|
||||||
@@ -55,5 +55,5 @@ in {
|
|||||||
retiolum = retiolumAddresses.kabsa;
|
retiolum = retiolumAddresses.kabsa;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "19.03";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,14 +42,8 @@
|
|||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
security.pam.services.lightdm.enableGnomeKeyring = true;
|
security.pam.services.lightdm.enableGnomeKeyring = true;
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-b3988d35-72a9-4e7c-992d-f500bb388554".device =
|
|
||||||
"/dev/disk/by-uuid/b3988d35-72a9-4e7c-992d-f500bb388554";
|
|
||||||
|
|
||||||
networking.hostName = "kibbeh";
|
networking.hostName = "kibbeh";
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
|||||||
@@ -1,42 +1,54 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
{
|
||||||
# and may be overwritten by future invocations. Please make changes
|
config,
|
||||||
# to /etc/nixos/configuration.nix instead.
|
lib,
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
boot = {
|
||||||
boot.initrd.kernelModules = [ ];
|
initrd = {
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
availableKernelModules = [
|
||||||
boot.extraModulePackages = [ ];
|
"ehci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
"sdhci_pci"
|
||||||
|
];
|
||||||
|
luks.devices."luks-16a8b3b0-5e0a-4d36-920c-eb6322a3c181".device =
|
||||||
|
"/dev/disk/by-uuid/16a8b3b0-5e0a-4d36-920c-eb6322a3c181";
|
||||||
|
luks.devices."luks-b3988d35-72a9-4e7c-992d-f500bb388554".device =
|
||||||
|
"/dev/disk/by-uuid/b3988d35-72a9-4e7c-992d-f500bb388554";
|
||||||
|
};
|
||||||
|
kernelModules = [ "kvm-intel" ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
|
loader = {
|
||||||
|
systemd-boot.enable = true;
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems = {
|
||||||
{ device = "/dev/disk/by-uuid/ecab6acb-66f1-41c9-8281-59c76cf8f0c6";
|
"/" = {
|
||||||
|
device = "/dev/disk/by-uuid/ecab6acb-66f1-41c9-8281-59c76cf8f0c6";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
"/boot" = {
|
||||||
boot.initrd.luks.devices."luks-16a8b3b0-5e0a-4d36-920c-eb6322a3c181".device = "/dev/disk/by-uuid/16a8b3b0-5e0a-4d36-920c-eb6322a3c181";
|
device = "/dev/disk/by-uuid/8066-63C2";
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/8066-63C2";
|
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [
|
||||||
[ { device = "/dev/disk/by-uuid/8cebdb17-4f2e-4750-8e91-71aa942bdfde"; }
|
{ device = "/dev/disk/by-uuid/8cebdb17-4f2e-4750-8e91-71aa942bdfde"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
# 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.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wwp0s29u1u4i6.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|||||||
Reference in New Issue
Block a user