knazarov/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to latest nixos release mostly

Browse source
This commit is contained in:
Konstantin Nazarov 2024-09-09 00:38:16 +01:00
parent 7136be51e0
commit 01609c59c2
Signed by: knazarov
GPG key ID: 4CFE0A42FA409C22
7 changed files with 89 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
configuration.nix
View file

@ -118,7 +118,7 @@ in {
xdg-utils xdg-utils
glib glib
dracula-theme dracula-theme
gnome3.adwaita-icon-theme adwaita-icon-theme
swaylock swaylock
swayidle swayidle
wl-clipboard wl-clipboard
@ -138,7 +138,7 @@ in {
slack slack
q-sh q-sh
notes-sh notes-sh
transmission-gtk transmission_4-gtk
mpv mpv
imv imv
okular okular
@ -154,12 +154,9 @@ in {
file file
zoom-us zoom-us
obs-studio obs-studio
gnome.nautilus nautilus
xfce.thunar xfce.thunar
zig zig
morph
gomuks
nheko
mullvad-vpn mullvad-vpn
mullvad mullvad
usbutils usbutils
@ -177,17 +174,24 @@ in {
go go
gopls gopls
lazygit lazygit
chromium
guile guile
solc solc
kdenlive kdenlive
discord kooha # screen capture
# ----------
# mainly needed for npm which decided to play hardball
automake
autoconf
# ----------
(pkgs.callPackage ./nil_cli.nix {}) (pkgs.callPackage ./nil_cli.nix {})
#network-manager-applet #network-manager-applet
(clang-tools.override { #(clang-tools.override {
llvmPackages = llvmPackages_17; #llvmPackages = llvmPackages_17;
enableLibcxx = false; #enableLibcxx = false;
}) # mainly for clang-format #}) # mainly for clang-format
clang-tools
# wget # wget
my_python my_python
]; ];
@ -397,7 +401,7 @@ in {
home-manager.users.knazarov = { home-manager.users.knazarov = {
# The home.stateVersion option does not have a default and must be set # The home.stateVersion option does not have a default and must be set
home.stateVersion = "24.05"; home.stateVersion = "24.11";
home.sessionVariables = { home.sessionVariables = {
EDITOR = "emacs -nw --no-splash"; EDITOR = "emacs -nw --no-splash";
@ -464,11 +468,6 @@ in {
gtk4.extraConfig = { gtk-enable-animations = "0"; }; gtk4.extraConfig = { gtk-enable-animations = "0"; };
}; };
programs.direnv = {
enable = true;
nix-direnv = { enable = true; };
};
# Workaround for https://github.com/nix-community/home-manager/issues/5146 # Workaround for https://github.com/nix-community/home-manager/issues/5146
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
@ -594,6 +593,8 @@ in {
"exec ${pkgs.foot}/bin/foot -T mylauncher -a mylauncher ${pkgs.q-sh}/bin/q"; "exec ${pkgs.foot}/bin/foot -T mylauncher -a mylauncher ${pkgs.q-sh}/bin/q";
"Mod4+p" = "Mod4+p" =
"exec '${pkgs.grim}/bin/grim -g \"$$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png'"; "exec '${pkgs.grim}/bin/grim -g \"$$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png'";
"Mod4+o" =
"exec '${pkgs.kooha}/bin/kooha'";
}; };
output = { output = {
"*" = { bg = "${./wallpaper.jpg} fill"; }; "*" = { bg = "${./wallpaper.jpg} fill"; };
@ -691,7 +692,7 @@ in {
services.syncthing = { enable = true; }; services.syncthing = { enable = true; };
home.pointerCursor = { home.pointerCursor = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
size = 24; size = 24;
x11 = { x11 = {
enable = true; enable = true;

32
emacs.el
View file

@ -750,7 +750,18 @@ Intended for `after-make-frame-functions'."
:ensure t :ensure t
:defer t :defer t
:config :config
(defun my-tree-slide-start ()
(set-window-margins (get-buffer-window (current-buffer))
10
10)
)
(defun my-tree-slide-end ()
(set-window-margins (get-buffer-window (current-buffer)) 0 0)
)
(setq org-tree-slide-slide-in-effect nil) (setq org-tree-slide-slide-in-effect nil)
(add-hook 'org-tree-slide-play-hook 'my-tree-slide-start)
(add-hook 'org-tree-slide-stop-hook 'my-tree-slide-end)
) )
;; -------- Email -------- ;; -------- Email --------
@ -1165,6 +1176,20 @@ Intended for `after-make-frame-functions'."
)) ))
) )
(defun nix-build ()
(let ((curproj (project-current nil)))
(when (and curproj
(file-exists-p (format "%s/flake.nix" (project-root curproj)))
(file-exists-p (format "%s/CMakeLists.txt" (project-root curproj)))
(file-exists-p (format "%s/build" (project-root curproj)))
)
(list "nix"
"develop" (format "%s#" (project-root curproj))
"--command" "bash" "-c"
(format "cd %s/build && eval \"$buildPhase\"" (project-root curproj)))
))
)
(with-eval-after-load 'eglot (with-eval-after-load 'eglot
(add-hook (add-hook
'eglot-managed-mode-hook 'eglot-managed-mode-hook
@ -1265,5 +1290,12 @@ Intended for `after-make-frame-functions'."
:ensure t :ensure t
) )
;; Valeri
(use-package lisp-mode
:ensure nil
:mode "\\.vli$"
)
(provide 'init) (provide 'init)
;;; init.el ends here ;;; init.el ends here

43
flake.lock
View file

@ -11,11 +11,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719193216, "lastModified": 1725815541,
"narHash": "sha256-4jggHHDsLt+i4/6lMNlZkHd3bzgV50feNpZGe4X3eMQ=", "narHash": "sha256-wcuqVnH4Y5UY25MX5Vc9HwBKLlD+wDjQjcqmTuBjx/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e3e9ef4c9904fddbd8c00f3288e6a3be26a6bf0b", "rev": "618b2f8393cc31d275d5373febf017dc38a0f72f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,16 +69,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718530513, "lastModified": 1725781935,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "narHash": "sha256-o6LRtdpgBTzev9n243Ktu3rn0/qsv0frFyJwU6vJsdE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "rev": "ec4c6928bbacc89cf10e9c959a7a47cbaad95344",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -90,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720134827, "lastModified": 1725763867,
"narHash": "sha256-idxCwgQezyNWlGnfKn6uKHJNDqw4mlyC7PdHBXv2hjo=", "narHash": "sha256-GlQFMVSE6oPXKudcP8leWLp2ea90t0VodTxr+RawQKM=",
"owner": "~knazarov", "owner": "~knazarov",
"repo": "knazarov.com", "repo": "knazarov.com",
"rev": "0cd8c2fabc37f8da2cbc9e54265a04222c65fa9f", "rev": "548b87510371686761e4630f8b3b379a9461f08e",
"type": "sourcehut" "type": "sourcehut"
}, },
"original": { "original": {
@ -105,11 +104,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719243159, "lastModified": 1725833752,
"narHash": "sha256-NeiyX4zPT2pPQ5khhBkXjxhlVl/pwqkR2pRry7xWE/E=", "narHash": "sha256-RjUtPX46yGjn90wMDtOjZGW+SF1RAbU6b06wWYxibXo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11f187974fe5e97ad50c9d5e2cd1a760875ebf2b", "rev": "75e28367ac76ff2fa13608fddfc34484e3a7ace3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +119,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719145550, "lastModified": 1725693463,
"narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=", "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8", "rev": "68e7dce0a6532e876980764167ad158174402c6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684711176, "lastModified": 1724107934,
"narHash": "sha256-PbMTPJNQMivX2uHthyDy4C1UUKD8moQVWlHPWiP9xI0=", "narHash": "sha256-huE0MjfQeufYqHD/3DjytnaIPexQoHXVYnZKZetetk0=",
"owner": "~knazarov", "owner": "~knazarov",
"repo": "q.sh", "repo": "q.sh",
"rev": "ee95b2afb54074fd004652816ffc9ad52fea9fc4", "rev": "ec5583ef44f6f7678a99fc084ca5f1aca4183b15",
"type": "sourcehut" "type": "sourcehut"
}, },
"original": { "original": {
@ -198,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719111739, "lastModified": 1725765163,
"narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", "narHash": "sha256-rfd2c47iVSFI6bRYy5l8wRijRBaYDeU7dM8XCDUGqlA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", "rev": "b68757cd2c3fa66d6ccaa0d046ce42a9324e0070",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -5,7 +5,8 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
home-manager.url = "github:nix-community/home-manager/release-24.05"; #home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
@ -46,7 +47,7 @@
node = dir: node = dir:
with hostAttrs dir; with hostAttrs dir;
buildSystemStable [ buildSystem [
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
emacs-overlay.overlay emacs-overlay.overlay

14
nil_cli.nix
View file

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, fetchurl }: { lib, fetchzip, stdenv, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nil_cli"; pname = "nil_cli";
version = "2024.07.02"; version = "2024.08.12";
src = fetchurl { src = fetchzip {
url = "https://github.com/NilFoundation/nil_cli/releases/download/2024.07.04/nil_cli-linux-x64"; url = "https://github.com/NilFoundation/nil_cli/releases/download/2024.08.12/nil-linux-x64.zip";
sha256 = "sha256-j0CL2cgeeKejGapYMZwRdIKqmj5BVLy8D2SuPl0H5kM="; sha256 = "sha256-URsmWhHGuSEK/Ug/wPT6GmzVwNyvTSl9BkOgn5ybEJU=";
}; };
phases = ["installPhase" "patchPhase"]; phases = ["installPhase" "patchPhase"];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp $src $out/bin/nil_cli cp $src/nil $out/bin/nil
chmod +x $out/bin/nil_cli chmod +x $out/bin/nil
''; '';
} }

5
nodes/knazarovcom/configuration.nix
View file

@ -141,12 +141,17 @@
services.forgejo = { services.forgejo = {
enable = true; enable = true;
package = pkgs.forgejo;
settings = { settings = {
service = { DISABLE_REGISTRATION = true; }; service = { DISABLE_REGISTRATION = true; };
server = { server = {
ROOT_URL = "https://git.knazarov.com/"; ROOT_URL = "https://git.knazarov.com/";
LANDING_PAGE = "explore"; LANDING_PAGE = "explore";
}; };
federation = {
ENABLED = "true";
};
}; };
}; };

2
nodes/mira/configuration.nix
View file

@ -19,7 +19,7 @@ in
boot.initrd.luks.devices."luks-8aa0584a-df60-42c3-adc2-d88b85544c85".device = "/dev/disk/by-uuid/8aa0584a-df60-42c3-adc2-d88b85544c85"; boot.initrd.luks.devices."luks-8aa0584a-df60-42c3-adc2-d88b85544c85".device = "/dev/disk/by-uuid/8aa0584a-df60-42c3-adc2-d88b85544c85";
boot.initrd.luks.devices."luks-8aa0584a-df60-42c3-adc2-d88b85544c85".keyFile = "/crypto_keyfile.bin"; boot.initrd.luks.devices."luks-8aa0584a-df60-42c3-adc2-d88b85544c85".keyFile = "/crypto_keyfile.bin";
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
vaapiVdpau vaapiVdpau