diff --git a/flake.lock b/flake.lock index 206b93f..4354c7b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1773115390, - "narHash": "sha256-nl1kcyM1locj//JnzC43hZIjY4z5opcTPqv1RnMZqPU=", + "lastModified": 1772596991, + "narHash": "sha256-awJJ4ATy9t8Svrx2z0zAftgXnUaGCFb2Ty0u036CnCQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "aecb1fc3e18c3cdcbdd96485b392ffa4584467e8", + "rev": "cd2d0893966c0a5c27345a9a72d0418b42b7e36d", "type": "gitlab" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1772633058, + "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1772598333, + "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4db8565..7c361d2 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ till = { imports = [ - ./home/minimal.nix + ./home/profiles/minimal.nix ./users/till/home.nix ]; }; @@ -84,21 +84,21 @@ till = { imports = [ - ./home/desktop-full.nix + ./home/profiles/desktop-full.nix ./users/till/home.nix ]; }; alt = { imports = [ - ./home/desktop-slim.nix + ./home/profiles/desktop-slim.nix ./users/alt/home.nix ]; }; guest = { imports = [ - ./home/desktop-slim.nix + ./home/profiles/desktop-slim.nix ./users/guest/home.nix ]; }; diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix index c417c93..a9c3a26 100644 --- a/home/modules/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -108,7 +108,7 @@ vim.lsp.enable('marksman') vim.lsp.enable('nil_ls') vim.lsp.enable('r_language_server') - vim.lsp.enable('rust_analyzer') + vim.lsp.enable('rust-analyzer') vim.lsp.enable('texlab') vim.lsp.enable('ts_ls') vim.lsp.enable('vimls') @@ -192,7 +192,7 @@ plugin = vim-slime; config = '' let g:slime_target = "tmux" - let g:slime_default_config = {"socket_name": get(split($TMUX, ","), 0), "target_pane": ":.2"} + let g:slime_default_config = {"socket_name": get(split($TMUX, ","), 0), "target_pane": ":.1"} let g:slime_no_mappings = 1 let g:slime_dont_ask_default = 1 xmap s SlimeRegionSend diff --git a/home/modules/r.nix b/home/modules/r.nix index 8b1b3ed..ea23218 100644 --- a/home/modules/r.nix +++ b/home/modules/r.nix @@ -2,7 +2,6 @@ let customPackages = with pkgs.rPackages; [ - bookdown catmaply clipr DAAG @@ -39,7 +38,6 @@ let tidyr tidyverse tmap - tufte xlsx yaml ]; diff --git a/home/modules/tasks.nix b/home/modules/tasks.nix index 3f6cd0c..76189c3 100644 --- a/home/modules/tasks.nix +++ b/home/modules/tasks.nix @@ -9,7 +9,7 @@ enable = true; package = pkgs.taskwarrior3; dataLocation = "${config.xdg.dataHome}/taskwarrior/tasks"; - # colorTheme = "light-256"; + colorTheme = "light-256"; config = { report.list.columns = ["id" "depends.indicator" "priority" "project" "recur.indicator" "scheduled.countdown" "due" "until.age" "status.short" "description.count" "tags"]; report.list.labels= ["ID" "D" "Prio" "Proj" "R" "Scheduled" "Due" "Until" "S" "Description" "Tags"]; diff --git a/system/desktop/cosmic.nix b/system/desktop/cosmic.nix index e46e6f0..a90680b 100644 --- a/system/desktop/cosmic.nix +++ b/system/desktop/cosmic.nix @@ -2,7 +2,6 @@ { services.desktopManager.cosmic.enable = true; - services.displayManager.cosmic-greeter.enable = true; services.system76-scheduler.enable = true; diff --git a/system/mail-server/postfix.nix b/system/mail-server/postfix.nix index 4b6d1e8..2fe5080 100644 --- a/system/mail-server/postfix.nix +++ b/system/mail-server/postfix.nix @@ -40,7 +40,6 @@ in { 123rf@ktiu.net REJECT jcb-co.jp-ktiu@ktiu.net REJECT info@ktiu.net REJECT - linkedin@ktiu.net REJECT '';