Commit 43871910
| SHA | 43871910aed3eeb2f2981b723013981870ad8833 |
|---|---|
| Author | Petri Hienonen <petri.hienonen at gmail dot com> |
| Author Date | 2025-12-01 07:52 +0200 |
| Committer | Petri Hienonen <petri.hienonen at gmail dot com> |
| Commit Date | 2025-12-01 07:52 +0200 |
| Parent(s) | dbb4480f0ff6 (diff) |
| Tree | f893655e0946 |
Update general evaluation and use inbuild mail systemd file
| File | + | - | Graph | |
|---|---|---|---|---|
| M | flake.nix | +8 | -40 |
|
| M | home/default.nix | +14 | -11 |
|
| M | home/mail/default.nix | +8 | -27 |
|
| M | home/nvim/default.nix | +3 | -3 |
|
| M | roles/shared.nix | +1 | -5 |
|
5 file(s) changed, 34 insertions(+), 86 deletions(-)
flake.nix
diff --git a/flake.nix b/flake.nix index ef3299b..ea35f66 100644 --- a/flake.nix +++ b/flake.nix @@ -38,22 +38,16 @@ editor = "nvim"; shell = "fish"; }; - pkgs-unstable = import nixpkgs-unstable { - system = "x86_64-linux"; - config.allowUnfree = true; - }; in { nixosConfigurations = { saarni = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; specialArgs = { inherit agenix inputs outputs vars - pkgs-unstable ; }; modules = [ @@ -71,7 +65,6 @@ vars inputs outputs - pkgs-unstable ; }; users = { @@ -79,17 +72,16 @@ }; }; } + { nixpkgs.hostPlatform = "x86_64-linux"; } ]; }; pihlaja = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; specialArgs = { inherit agenix inputs outputs vars - pkgs-unstable ; }; modules = [ @@ -107,7 +99,6 @@ vars inputs outputs - pkgs-unstable ; }; users = { @@ -115,33 +106,21 @@ }; }; } - #{ - #nixpkgs = { - # config.cudaSupport = true; - #hostPlatform = { - # aesSupport = true; - # avx2Support = true; - # # useLLVM = true; - # gcc = { - # arch = "x86-64-v3"; - # }; - # system = "x86_64-linux"; - # linker = "mold"; - # libc = "glibc"; - #}; - #}; - #} + { + nixpkgs = { + config.cudaSupport = true; + hostPlatform = "x86_64-linux"; + }; + } ]; }; kataja = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; specialArgs = { inherit agenix inputs outputs vars - pkgs-unstable ; }; modules = [ @@ -159,7 +138,6 @@ inputs outputs vars - pkgs-unstable ; }; users = { @@ -170,17 +148,7 @@ { nixpkgs = { config.rocmSupport = true; - #hostPlatform = { - # aesSupport = true; - # avx2Support = true; - # # useLLVM = true; - # gcc = { - # arch = "x86-64-v3"; - # }; - # system = "x86_64-linux"; - # linker = "mold"; - # libc = "glibc"; - #}; + hostPlatform = "x86_64-linux"; }; } ];
home/default.nix
diff --git a/home/default.nix b/home/default.nix index c8c8d52..1509591 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,13 +1,16 @@ { inputs, - lib, config, vars, pkgs, - pkgs-unstable, ... }: - +let + unstable = import inputs.nixpkgs-unstable { + system = pkgs.stdenv.hostPlatform.system; + config.allowUnfree = true; + }; +in { imports = [ # ./alacritty @@ -26,7 +29,7 @@ ./mail ./mpv ./newsboat - ./nvim + (import ./nvim { inherit unstable; }) ./tenere ./ticker ./vale @@ -377,7 +380,7 @@ clipse # clipboard management impala # iwd terminal ui lux # youtube-downloader - pkgs-unstable.nom # rss reader + unstable.nom # rss reader rmpc # tui for mpd rtorrent # torrent starship # shell aid @@ -450,10 +453,10 @@ nvimpager # use neovim as pager pistol # file preview pkg-config # needed for compilation - pkgs-unstable.goose-cli # llm cli - pkgs-unstable.vale # spellcheck - pkgs-unstable.valeStyles.microsoft # spellcheck linters - pkgs-unstable.valeStyles.write-good # spellcheck linters + unstable.goose-cli # llm cli + unstable.vale # spellcheck + unstable.valeStyles.microsoft # spellcheck linters + unstable.valeStyles.write-good # spellcheck linters playerctl poppler-utils # pdf utilities rdrview # extract content from web page @@ -480,8 +483,8 @@ lean4 # theorem prover - broken lld # c and rust linker nodePackages.jsdoc # javascript documentation - pkgs-unstable.go - pkgs-unstable.golint # linter for go + unstable.go + unstable.golint # linter for go uv # python package installer ]; };
home/mail/default.nix
diff --git a/home/mail/default.nix b/home/mail/default.nix index 2b2b031..775f0b0 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -167,7 +167,14 @@ in }; # Global settings for programs (not account-specific) - programs.mbsync.enable = true; + programs.mbsync = { + enable = true; + }; + + services.mbsync = { + enable = true; + frequency = "*:0/5"; + }; programs.notmuch = { enable = true; @@ -215,30 +222,4 @@ in }; }; }; - - systemd.user.services.mbsync = { - Unit = { - Description = "Sync mail with mbsync"; - After = [ "network-online.target" ]; - Wants = [ "network-online.target" ]; - }; - Service = { - Type = "oneshot"; - ExecStart = "${pkgs.isync}/bin/mbsync -a"; - }; - Install.WantedBy = [ "default.target" ]; - }; - - systemd.user.timers.mbsync = { - Unit = { - Description = "Timer for mbsync mail synchronization"; - Requires = "mbsync.service"; - }; - Timer = { - OnBootSec = "5m"; - OnUnitInactiveSec = "5m"; - Unit = "mbsync.service"; - }; - Install.WantedBy = [ "timers.target" ]; - }; }
home/nvim/default.nix
diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 038d8d6..5f90be4 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, ... }: +{ unstable, ... }: { programs.neovim = @@ -12,7 +12,7 @@ viAlias = true; vimAlias = true; vimdiffAlias = true; - extraPackages = with pkgs-unstable; [ + extraPackages = with unstable; [ inotify-tools # debuggers @@ -54,7 +54,7 @@ ps.debugpy ps.pynvim ]; - plugins = with pkgs-unstable.vimPlugins; [ + plugins = with unstable.vimPlugins; [ { plugin = nvim-dap; config = toLuaFile ./plugins/dap.lua;
roles/shared.nix
diff --git a/roles/shared.nix b/roles/shared.nix index 2eddf0f..f3b5cab 100644 --- a/roles/shared.nix +++ b/roles/shared.nix @@ -60,9 +60,6 @@ ''; }; system = { - switch = { - enable = true; - }; activationScripts.diff = { supportsDryActivation = true; text = '' @@ -328,7 +325,7 @@ "/share/applications" ]; systemPackages = with pkgs; [ - agenix.packages.${system}.default + agenix.packages.${pkgs.stdenv.hostPlatform.system}.default clinfo coreutils curl @@ -353,7 +350,6 @@ variables = { EDITOR = "${pkgs.neovim}/bin/nvim"; LD_LIBRARY_PATH = "${pkgs.vulkan-loader}/lib:$LD_LIBRARY_PATH"; - NIXPKGS_ALLOW_UNFREE = 1; QT_QPA_PLATFORM = "xcb"; SYSTEMD_COLORS = 256; SYSTEMD_LOG_COLOR = 1;