Compare commits
2 commits
main
...
nixos-25.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 173febf6ad | |||
| e16c00c29d |
20 changed files with 53 additions and 67 deletions
55
flake.lock
generated
55
flake.lock
generated
|
|
@ -297,11 +297,11 @@
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747046372,
|
"lastModified": 1761588595,
|
||||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -446,11 +446,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742649964,
|
"lastModified": 1763319842,
|
||||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -504,16 +504,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763992789,
|
"lastModified": 1767280655,
|
||||||
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
|
"narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
|
"rev": "d49d2543f02dbd789ed032188c84570d929223cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -585,20 +585,19 @@
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
]
|
||||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763302796,
|
"lastModified": 1766537863,
|
||||||
"narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=",
|
"narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "5b38fb599f50e9d78325d1d2706e36303c166047",
|
"rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
@ -619,22 +618,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-25_05": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1747610100,
|
|
||||||
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-25.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764242076,
|
"lastModified": 1764242076,
|
||||||
|
|
@ -698,16 +681,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764316264,
|
"lastModified": 1767047869,
|
||||||
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
|
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
|
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
description = "My system config";
|
description = "My system config";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-25.05";
|
nixpkgs.url = "nixpkgs/nixos-25.11";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
vpsadminos.url = "github:vpsfreecz/vpsadminos";
|
vpsadminos.url = "github:vpsfreecz/vpsadminos";
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-mailserver = {
|
nixos-mailserver = {
|
||||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
|
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,14 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
enableManageSieve = true;
|
enableManageSieve = true;
|
||||||
|
|
||||||
|
stateVersion = 3;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Prefer ipv4 and use main ipv6 to avoid reverse DNS issues
|
# Prefer ipv4 and use main ipv6 to avoid reverse DNS issues
|
||||||
services.postfix.extraConfig = ''
|
services.postfix.settings.main = {
|
||||||
smtp_address_preference = ipv4
|
smtp_address_preference = "ipv4";
|
||||||
'';
|
};
|
||||||
|
|
||||||
# Webmail
|
# Webmail
|
||||||
services.roundcube = {
|
services.roundcube = {
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
libbsd,
|
libbsd,
|
||||||
wayland,
|
wayland,
|
||||||
wayland-protocols,
|
wayland-protocols,
|
||||||
|
libcap,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|
@ -35,6 +36,7 @@ stdenv.mkDerivation {
|
||||||
libbsd
|
libbsd
|
||||||
wayland
|
wayland
|
||||||
wayland-protocols
|
wayland-protocols
|
||||||
|
libcap
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [ "WAYLAND=1" ];
|
makeFlags = [ "WAYLAND=1" ];
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
python3Packages,
|
python3Packages,
|
||||||
wrapGAppsHook,
|
wrapGAppsHook3,
|
||||||
gtk3,
|
gtk3,
|
||||||
gobject-introspection,
|
gobject-introspection,
|
||||||
}:
|
}:
|
||||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
python3Packages.wrapPython
|
python3Packages.wrapPython
|
||||||
wrapGAppsHook
|
wrapGAppsHook3
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
vala,
|
vala,
|
||||||
wrapGAppsHook,
|
wrapGAppsHook3,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lipsum";
|
pname = "lipsum";
|
||||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
vala
|
vala
|
||||||
wrapGAppsHook
|
wrapGAppsHook3
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [ "PRG=${pname}" ];
|
makeFlags = [ "PRG=${pname}" ];
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
helix-man-pager = [ helix-pager ];
|
helix-man-pager = [ helix-pager ];
|
||||||
bcrypt = [ apacheHttpd ];
|
bcrypt = [ apacheHttpd ];
|
||||||
musmenu = [
|
musmenu = [
|
||||||
mpc-cli
|
mpc
|
||||||
wdmenu
|
wdmenu
|
||||||
trash-cli
|
trash-cli
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
|
|
@ -113,11 +113,11 @@
|
||||||
mpv
|
mpv
|
||||||
pqiv
|
pqiv
|
||||||
python3Packages.deemix
|
python3Packages.deemix
|
||||||
mpc-cli
|
mpc
|
||||||
mpdDup
|
mpdDup
|
||||||
];
|
];
|
||||||
mpdDup = [
|
mpdDup = [
|
||||||
mpc-cli
|
mpc
|
||||||
perl
|
perl
|
||||||
];
|
];
|
||||||
readQrCode = [
|
readQrCode = [
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,5 @@
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
services.udev.packages = [ pkgs.android-udev-rules ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,12 +43,12 @@
|
||||||
|
|
||||||
services.geoclue2.enable = true;
|
services.geoclue2.enable = true;
|
||||||
|
|
||||||
systemd.extraConfig = ''
|
systemd.settings.Manager = {
|
||||||
DefaultTimeoutStopSec=10s
|
DefaultTimeoutStopSec = "10s";
|
||||||
'';
|
};
|
||||||
services.logind.extraConfig = ''
|
services.logind.settings.Login = {
|
||||||
HandlePowerKey=suspend
|
HandlePowerKey = "suspend";
|
||||||
'';
|
};
|
||||||
services.upower.enable = true;
|
services.upower.enable = true;
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-color-emoji
|
||||||
nerd-fonts.fira-code
|
nerd-fonts.fira-code
|
||||||
nerd-fonts.hack
|
nerd-fonts.hack
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ in
|
||||||
ffmpeg
|
ffmpeg
|
||||||
obs-studio
|
obs-studio
|
||||||
imagemagick
|
imagemagick
|
||||||
mpc-cli
|
mpc
|
||||||
helvum
|
helvum
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
{
|
{
|
||||||
services.gitea-actions-runner = {
|
services.gitea-actions-runner = {
|
||||||
package = pkgs.forgejo-actions-runner;
|
package = pkgs.forgejo-runner;
|
||||||
instances.default = {
|
instances.default = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "monolith";
|
name = "monolith";
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
tdesktop
|
telegram-desktop
|
||||||
discord-canary
|
discord-canary
|
||||||
thunderbird
|
thunderbird
|
||||||
element-desktop
|
element-desktop
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ in
|
||||||
# steam # It's enabled in the system config
|
# steam # It's enabled in the system config
|
||||||
tlauncher
|
tlauncher
|
||||||
gamescope
|
gamescope
|
||||||
glxinfo
|
mesa-demos
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
gavin-bc
|
gavin-bc
|
||||||
file
|
file
|
||||||
jq
|
jq
|
||||||
du-dust
|
dust
|
||||||
p7zip
|
p7zip
|
||||||
tealdeer
|
tealdeer
|
||||||
micro
|
micro
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@ in
|
||||||
terminal
|
terminal
|
||||||
ranger
|
ranger
|
||||||
bmenu
|
bmenu
|
||||||
kak-lsp
|
kakoune-lsp
|
||||||
kak-tree-sitter
|
kak-tree-sitter
|
||||||
kak-pager
|
kak-pager
|
||||||
kak-man-pager
|
kak-man-pager
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
|
||||||
highlight # syntax highlight
|
highlight # syntax highlight
|
||||||
poppler_utils # pdf preview
|
poppler-utils # pdf preview
|
||||||
ffmpeg # audio preview
|
ffmpeg # audio preview
|
||||||
ffmpegthumbnailer # video preview
|
ffmpegthumbnailer # video preview
|
||||||
fontforge # font preview
|
fontforge # font preview
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ in
|
||||||
config = {
|
config = {
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.rofi-wayland.override {
|
package = pkgs.rofi.override {
|
||||||
plugins = with pkgs; [
|
plugins = with pkgs; [
|
||||||
rofi-emoji
|
rofi-emoji
|
||||||
rofi-file-browser
|
rofi-file-browser
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ in
|
||||||
{
|
{
|
||||||
timeout = 1800;
|
timeout = 1800;
|
||||||
command = asScript "swayidle-suspend-monitors" ''
|
command = asScript "swayidle-suspend-monitors" ''
|
||||||
${pkgs.mpc_cli}/bin/mpc status | grep "^[playing]" > /dev/null || ${pkgs.sway}/bin/swaymsg "output * dpms off"
|
${pkgs.mpc}/bin/mpc status | grep "^[playing]" > /dev/null || ${pkgs.sway}/bin/swaymsg "output * dpms off"
|
||||||
'';
|
'';
|
||||||
resumeCommand = asScript "swayidle-wakeup-monitors" ''
|
resumeCommand = asScript "swayidle-wakeup-monitors" ''
|
||||||
${pkgs.sway}/bin/swaymsg "output * dpms on"
|
${pkgs.sway}/bin/swaymsg "output * dpms on"
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ in
|
||||||
};
|
};
|
||||||
mpd =
|
mpd =
|
||||||
let
|
let
|
||||||
mpc = "${pkgs.mpc-cli}/bin/mpc";
|
mpc = "${pkgs.mpc}/bin/mpc";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
format = "{stateIcon} {title} - {artist}";
|
format = "{stateIcon} {title} - {artist}";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue