aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Hienonen <petri.hienonen@gmail.com>2025-12-03 09:55:11 +0200
committerPetri Hienonen <petri.hienonen@gmail.com>2025-12-03 12:33:34 +0200
commit58b97370ffa0f08ab9ee07dca9cd9f580b7f491d (patch)
treef6e1f9eb6f16889b84e93272d0334800bb115371
parente80de5ae7c0f96638820ee0b60a3776321fa19f1 (diff)
downloadnixos-58b97370ffa0f08ab9ee07dca9cd9f580b7f491d.tar.zst
Fixes
-rw-r--r--flake.nix8
-rw-r--r--home/default.nix10
-rw-r--r--home/dunst/default.nix2
-rw-r--r--home/hyprland/default.nix2
-rw-r--r--home/nvim/options.lua2
-rw-r--r--home/walker/config.toml251
-rw-r--r--home/walker/default.nix292
-rw-r--r--home/wallpapers/default.nix2
-rw-r--r--hosts/saarni/hardware-configuration.nix1
-rw-r--r--roles/shared.nix11
10 files changed, 309 insertions, 272 deletions
diff --git a/flake.nix b/flake.nix
index 1b483d1..50c4436 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,13 +30,13 @@
let
inherit (self) outputs;
vars = {
- user = "petri";
- name = "Petri Hienonen";
+ editor = "nvim";
email = "petri.hienonen@gmail.com";
location = "$HOME/.nix";
- terminal = "ghostty";
- editor = "nvim";
+ name = "Petri Hienonen";
shell = "nushell";
+ terminal = "ghostty";
+ user = "petri";
};
in
{
diff --git a/home/default.nix b/home/default.nix
index 0c2f108..8f892b4 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -58,7 +58,10 @@ in
path = "${config.home.homeDirectory}/.secrets/radicale";
file = ../secrets/radicale.age;
};
- unsplash_access_key.file = ../secrets/unsplash_access_key.age;
+ unsplash_access_key = {
+ path = "${config.home.homeDirectory}/.secrets/unsplash";
+ file = ../secrets/unsplash_access_key.age;
+ };
gmail = {
file = ../secrets/gmail.age;
path = "${config.home.homeDirectory}/.secrets/gmail";
@@ -73,6 +76,7 @@ in
};
gtk = {
+ colorScheme = "dark";
enable = true;
theme = {
package = pkgs.whitesur-gtk-theme;
@@ -332,6 +336,7 @@ in
nix-index = {
enable = true;
enableFishIntegration = true;
+ enableNushellIntegration = true;
};
pistol.enable = true;
ghostty = {
@@ -527,7 +532,6 @@ in
obsidian # note taking application
sqlitebrowser # sqlite
swayimg # image viewer
- walker # launcher
wireshark
zathura # pdf viewer
@@ -563,7 +567,6 @@ in
dmidecode # memory information
espflash # ESP32 flasher
espup # ESP32 development
- eza # modern file list
fd # find files by filenames
file # show the type of file
font-awesome # icons
@@ -674,7 +677,6 @@ in
};
};
};
- wayland.windowManager.hyprland.systemd.variables = [ "--all" ];
systemd.user = {
startServices = "sd-switch";
};
diff --git a/home/dunst/default.nix b/home/dunst/default.nix
index 4843a90..7eca193 100644
--- a/home/dunst/default.nix
+++ b/home/dunst/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
services.dunst = {
enable = true;
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 992fa09..24e7357 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -99,7 +99,7 @@
"$mainMod, F, fullscreen"
"$mainMod, C, killactive,"
"$mainMod, Tab, cyclenext"
- ", Print, exec, ${pkgs.grim}/bin/grim - | wl-copy && wl-paste > ~/Pictures/screenshots/Screenshot-$(date +%F_%T).png && dunstify 'Screenshot of the whole screen taken' -t 1000"
+ ", Print, exec, ${pkgs.grim}/bin/grim - | ${pkgs.wl-clipboard}/bin/wl-copy && ${pkgs.wl-clipboard}/bin/wl-paste > ~/Pictures/screenshots/Screenshot-$(date +%F_%T).png && dunstify 'Screenshot of the whole screen taken' -t 1000"
", XF86MonBrightnessUp, exec, brightnessctl s -e 5%+"
", XF86MonBrightnessDown, exec, brightnessctl s -e 5%-"
", XF86AudioRaiseVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
diff --git a/home/nvim/options.lua b/home/nvim/options.lua
index ee2fac2..9911824 100644
--- a/home/nvim/options.lua
+++ b/home/nvim/options.lua
@@ -1,7 +1,7 @@
vim.opt.title = true -- set the title of window to the value of the titlestring
vim.opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to
vim.g.have_nerd_fonts = true
-vim.o.shell = "fish"
+vim.o.shell = "nushell"
vim.o.fileencoding = "utf-8"
vim.opt.conceallevel = 0
vim.opt.clipboard:append("unnamedplus") -- copy & paste
diff --git a/home/walker/config.toml b/home/walker/config.toml
deleted file mode 100644
index 5c2b1ef..0000000
--- a/home/walker/config.toml
+++ /dev/null
@@ -1,251 +0,0 @@
-app_launch_prefix = ""
-terminal_title_flag = ""
-locale = ""
-close_when_open = false
-theme = "default"
-monitor = ""
-hotreload_theme = false
-as_window = false
-timeout = 0
-disable_click_to_close = false
-force_keyboard_focus = false
-
-[keys]
-accept_typeahead = ["tab"]
-trigger_labels = "lalt"
-next = ["down"]
-prev = ["up"]
-close = ["esc"]
-remove_from_history = ["shift backspace"]
-resume_query = ["ctrl r"]
-toggle_exact_search = ["ctrl m"]
-
-[keys.activation_modifiers]
-keep_open = "shift"
-alternate = "alt"
-
-[keys.ai]
-clear_session = ["ctrl x"]
-copy_last_response = ["ctrl c"]
-resume_session = ["ctrl r"]
-run_last_response = ["ctrl e"]
-
-[events]
-on_activate = ""
-on_selection = ""
-on_exit = ""
-on_launch = ""
-on_query_change = ""
-
-[list]
-dynamic_sub = true
-keyboard_scroll_style = "emacs"
-max_entries = 50
-show_initial_entries = true
-single_click = true
-visibility_threshold = 20
-placeholder = "No Results"
-
-[search]
-argument_delimiter = "#"
-placeholder = "Search..."
-delay = 0
-resume_last_query = false
-
-[activation_mode]
-labels = "jkl;asdf"
-
-[builtins.applications]
-weight = 5
-name = "applications"
-placeholder = "Applications"
-prioritize_new = true
-hide_actions_with_empty_query = true
-context_aware = true
-refresh = true
-show_sub_when_single = true
-show_icon_when_single = true
-show_generic = true
-history = true
-
-[builtins.applications.actions]
-enabled = true
-hide_category = false
-hide_without_query = true
-
-[builtins.bookmarks]
-weight = 5
-placeholder = "Bookmarks"
-name = "bookmarks"
-icon = "bookmark"
-switcher_only = true
-
-[[builtins.bookmarks.entries]]
-label = "Walker"
-url = "https://github.com/abenz1267/walker"
-keywords = ["walker", "github"]
-
-[builtins.xdph_picker]
-hidden = true
-weight = 5
-placeholder = "Screen/Window Picker"
-show_sub_when_single = true
-name = "xdphpicker"
-switcher_only = true
-
-[builtins.ai]
-weight = 5
-placeholder = "AI"
-name = "ai"
-icon = "help-browser"
-switcher_only = true
-show_sub_when_single = true
-
-[[builtins.ai.anthropic.prompts]]
-model = "claude-3-7-sonnet-20250219"
-temperature = 1
-max_tokens = 1_000
-label = "General Assistant"
-prompt = "You are a helpful general assistant. Keep your answers short and precise."
-
-[builtins.calc]
-require_number = true
-weight = 5
-name = "calc"
-icon = "accessories-calculator"
-placeholder = "Calculator"
-min_chars = 4
-
-[builtins.windows]
-weight = 5
-icon = "view-restore"
-name = "windows"
-placeholder = "Windows"
-show_icon_when_single = true
-
-[builtins.clipboard]
-always_put_new_on_top = true
-exec = "wl-copy"
-weight = 5
-name = "clipboard"
-avoid_line_breaks = true
-placeholder = "Clipboard"
-image_height = 300
-max_entries = 10
-switcher_only = true
-
-[builtins.commands]
-weight = 5
-icon = "utilities-terminal"
-switcher_only = true
-name = "commands"
-placeholder = "Commands"
-
-[builtins.custom_commands]
-weight = 5
-icon = "utilities-terminal"
-name = "custom_commands"
-placeholder = "Custom Commands"
-
-[builtins.emojis]
-exec = "wl-copy"
-weight = 5
-name = "emojis"
-placeholder = "Emojis"
-switcher_only = true
-history = true
-typeahead = true
-show_unqualified = false
-
-[builtins.symbols]
-after_copy = ""
-weight = 5
-name = "symbols"
-placeholder = "Symbols"
-switcher_only = true
-history = true
-typeahead = true
-
-[builtins.finder]
-use_fd = false
-fd_flags = "--ignore-vcs --type file"
-weight = 5
-icon = "file"
-name = "finder"
-placeholder = "Finder"
-switcher_only = true
-ignore_gitignore = true
-refresh = true
-concurrency = 8
-show_icon_when_single = true
-preview_images = false
-
-[builtins.runner]
-eager_loading = true
-weight = 5
-icon = "utilities-terminal"
-name = "runner"
-placeholder = "Runner"
-typeahead = true
-history = true
-generic_entry = false
-refresh = true
-use_fd = false
-
-[builtins.ssh]
-weight = 5
-icon = "preferences-system-network"
-name = "ssh"
-placeholder = "SSH"
-switcher_only = true
-history = true
-refresh = true
-
-[builtins.switcher]
-weight = 5
-name = "switcher"
-placeholder = "Switcher"
-prefix = "/"
-
-[builtins.websearch]
-keep_selection = true
-weight = 5
-icon = "applications-internet"
-name = "websearch"
-placeholder = "Websearch"
-
-[[builtins.websearch.entries]]
-name = "Google"
-url = "https://www.google.com/search?q=%TERM%"
-
-[[builtins.websearch.entries]]
-name = "DuckDuckGo"
-url = "https://duckduckgo.com/?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Ecosia"
-url = "https://www.ecosia.org/search?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Yandex"
-url = "https://yandex.com/search/?text=%TERM%"
-switcher_only = true
-
-[builtins.dmenu]
-hidden = true
-weight = 5
-name = "dmenu"
-placeholder = "Dmenu"
-switcher_only = true
-show_icon_when_single = true
-
-[builtins.translation]
-delay = 1000
-weight = 5
-name = "translation"
-icon = "accessories-dictionary"
-placeholder = "Translation"
-switcher_only = true
-provider = "googlefree"
diff --git a/home/walker/default.nix b/home/walker/default.nix
index e28780f..6887606 100644
--- a/home/walker/default.nix
+++ b/home/walker/default.nix
@@ -1,9 +1,295 @@
{ config, pkgs, ... }:
{
- home.file = {
- "/home/petri/.config/walker/config.toml" = {
- source = ./config.toml;
+
+ services.walker = {
+ enable = true;
+ systemd.enable = true;
+ settings = {
+ app_launch_prefix = "";
+ terminal_title_flag = "";
+ locale = "";
+ close_when_open = false;
+ theme = "default";
+ monitor = "";
+ hotreload_theme = false;
+ as_window = false;
+ timeout = 0;
+ disable_click_to_close = false;
+ force_keyboard_focus = false;
+
+ keys = {
+ accept_typeahead = [ "tab" ];
+ trigger_labels = "lalt";
+ next = [ "down" ];
+ prev = [ "up" ];
+ close = [ "esc" ];
+ remove_from_history = [ "shift backspace" ];
+ resume_query = [ "ctrl r" ];
+ toggle_exact_search = [ "ctrl m" ];
+
+ activation_modifiers = {
+ keep_open = "shift";
+ alternate = "alt";
+ };
+
+ ai = {
+ clear_session = [ "ctrl x" ];
+ copy_last_response = [ "ctrl c" ];
+ resume_session = [ "ctrl r" ];
+ run_last_response = [ "ctrl e" ];
+ };
+ };
+
+ events = {
+ on_activate = "";
+ on_selection = "";
+ on_exit = "";
+ on_launch = "";
+ on_query_change = "";
+ };
+
+ list = {
+ dynamic_sub = true;
+ keyboard_scroll_style = "emacs";
+ max_entries = 50;
+ show_initial_entries = true;
+ single_click = true;
+ visibility_threshold = 20;
+ placeholder = "No Results";
+ };
+
+ search = {
+ argument_delimiter = "#";
+ placeholder = "Search...";
+ delay = 0;
+ resume_last_query = false;
+ };
+
+ activation_mode = {
+ labels = "jkl;asdf";
+ };
+
+ builtins = {
+ applications = {
+ weight = 5;
+ name = "applications";
+ placeholder = "Applications";
+ prioritize_new = true;
+ hide_actions_with_empty_query = true;
+ context_aware = true;
+ refresh = true;
+ show_sub_when_single = true;
+ show_icon_when_single = true;
+ show_generic = true;
+ history = true;
+
+ actions = {
+ enabled = true;
+ hide_category = false;
+ hide_without_query = true;
+ };
+ };
+
+ bookmarks = {
+ weight = 5;
+ placeholder = "Bookmarks";
+ name = "bookmarks";
+ icon = "bookmark";
+ switcher_only = true;
+
+ entries = [
+ {
+ label = "Walker";
+ url = "https://github.com/abenz1267/walker";
+ keywords = [
+ "walker"
+ "github"
+ ];
+ }
+ ];
+ };
+
+ xdph_picker = {
+ hidden = true;
+ weight = 5;
+ placeholder = "Screen/Window Picker";
+ show_sub_when_single = true;
+ name = "xdphpicker";
+ switcher_only = true;
+ };
+
+ ai = {
+ weight = 5;
+ placeholder = "AI";
+ name = "ai";
+ icon = "help-browser";
+ switcher_only = true;
+ show_sub_when_single = true;
+
+ anthropic = {
+ prompts = [
+ {
+ model = "claude-3-7-sonnet-20250219";
+ temperature = 1;
+ max_tokens = 1000;
+ label = "General Assistant";
+ prompt = "You are a helpful general assistant. Keep your answers short and precise.";
+ }
+ ];
+ };
+ };
+
+ calc = {
+ require_number = true;
+ weight = 5;
+ name = "calc";
+ icon = "accessories-calculator";
+ placeholder = "Calculator";
+ min_chars = 4;
+ };
+
+ windows = {
+ weight = 5;
+ icon = "view-restore";
+ name = "windows";
+ placeholder = "Windows";
+ show_icon_when_single = true;
+ };
+
+ clipboard = {
+ always_put_new_on_top = true;
+ exec = "${pkgs.wl-clipboard}/bin/wl-copy";
+ weight = 5;
+ name = "clipboard";
+ avoid_line_breaks = true;
+ placeholder = "Clipboard";
+ image_height = 300;
+ max_entries = 10;
+ switcher_only = true;
+ };
+
+ commands = {
+ weight = 5;
+ icon = "utilities-terminal";
+ switcher_only = true;
+ name = "commands";
+ placeholder = "Commands";
+ };
+
+ custom_commands = {
+ weight = 5;
+ icon = "utilities-terminal";
+ name = "custom_commands";
+ placeholder = "Custom Commands";
+ };
+
+ emojis = {
+ exec = "${pkgs.wl-clipboard}/bin/wl-copy";
+ weight = 5;
+ name = "emojis";
+ placeholder = "Emojis";
+ switcher_only = true;
+ history = true;
+ typeahead = true;
+ show_unqualified = false;
+ };
+
+ symbols = {
+ after_copy = "";
+ weight = 5;
+ name = "symbols";
+ placeholder = "Symbols";
+ switcher_only = true;
+ history = true;
+ typeahead = true;
+ };
+
+ finder = {
+ use_fd = false;
+ fd_flags = "--ignore-vcs --type file";
+ weight = 5;
+ icon = "file";
+ name = "finder";
+ placeholder = "Finder";
+ switcher_only = true;
+ ignore_gitignore = true;
+ refresh = true;
+ concurrency = 8;
+ show_icon_when_single = true;
+ preview_images = false;
+ };
+
+ runner = {
+ eager_loading = true;
+ weight = 5;
+ icon = "utilities-terminal";
+ name = "runner";
+ placeholder = "Runner";
+ typeahead = true;
+ history = true;
+ generic_entry = false;
+ refresh = true;
+ use_fd = false;
+ };
+
+ ssh = {
+ weight = 5;
+ icon = "preferences-system-network";
+ name = "ssh";
+ placeholder = "SSH";
+ switcher_only = true;
+ history = true;
+ refresh = true;
+ };
+
+ switcher = {
+ weight = 5;
+ name = "switcher";
+ placeholder = "Switcher";
+ prefix = "/";
+ };
+
+ websearch = {
+ keep_selection = true;
+ weight = 5;
+ icon = "applications-internet";
+ name = "websearch";
+ placeholder = "Websearch";
+
+ entries = [
+ {
+ name = "Google";
+ url = "https://www.google.com/search?q=%TERM%";
+ }
+ {
+ name = "DuckDuckGo";
+ url = "https://duckduckgo.com/?q=%TERM%";
+ switcher_only = true;
+ }
+ {
+ name = "Ecosia";
+ url = "https://www.ecosia.org/search?q=%TERM%";
+ switcher_only = true;
+ }
+ {
+ name = "Yandex";
+ url = "https://yandex.com/search/?text=%TERM%";
+ switcher_only = true;
+ }
+ ];
+ };
+
+ translation = {
+ delay = 1000;
+ weight = 5;
+ name = "translation";
+ icon = "accessories-dictionary";
+ placeholder = "Translation";
+ switcher_only = true;
+ provider = "googlefree";
+ };
+ };
};
};
}
diff --git a/home/wallpapers/default.nix b/home/wallpapers/default.nix
index 5b1f3c2..a358a70 100644
--- a/home/wallpapers/default.nix
+++ b/home/wallpapers/default.nix
@@ -63,7 +63,7 @@ in
After = [ "graphical-session.target" ];
};
Service = {
- loadCredential = [ "login_token:${config.age.secrets.unsplash_access_key.path}" ];
+ LoadCredential = [ "login_token:${config.age.secrets.unsplash_access_key.path}" ];
Type = "oneshot";
ExecStart = "${wallpaperScript}";
};
diff --git a/hosts/saarni/hardware-configuration.nix b/hosts/saarni/hardware-configuration.nix
index 798aa7b..eac5532 100644
--- a/hosts/saarni/hardware-configuration.nix
+++ b/hosts/saarni/hardware-configuration.nix
@@ -38,7 +38,6 @@
kernelParams = [
"default_hugepagesz=2M"
"i915.enable_guc=3"
- "i915.fastboot=1"
"mitigations=off"
"nospectre_v2"
"snd-intel-dspcfg.dsp_driver=3"
diff --git a/roles/shared.nix b/roles/shared.nix
index a542623..c061a49 100644
--- a/roles/shared.nix
+++ b/roles/shared.nix
@@ -119,7 +119,6 @@
"vm.nr_hugepages" = 512;
"vm.dirty_background_ratio" = 5;
"vm.swappiness" = 10;
- "kernel.sched_wakeup_granularity_ns" = 500000;
};
loader = {
systemd-boot = {
@@ -332,19 +331,21 @@
clinfo
coreutils
curl
+ fish
git
gnumake
gnupg
- tuigreet
linux-firmware
lm_sensors
mimalloc
minio-client
neovim
+ nushell
nvd
procps
s3fs
sysfsutils
+ tuigreet
unrar
unzip
usbutils
@@ -362,8 +363,8 @@
};
fileSystems."/media/llm" = {
- device = "llm";
fsType = "fuse./run/current-system/sw/bin/s3fs";
+ device = "llm";
noCheck = true;
options = [
"_netdev"
@@ -377,8 +378,8 @@
};
fileSystems."/media/skydrive" = {
- device = "skydrive";
fsType = "fuse./run/current-system/sw/bin/s3fs";
+ device = "skydrive";
noCheck = true;
options = [
"_netdev"
@@ -703,7 +704,7 @@
ananicy = {
enable = true;
package = pkgs.ananicy-cpp;
- rulesProvider = pkgs.ananicy-rules-cachyos;
+ rulesProvider = pkgs.ananicy-cpp;
};
fwupd = {
enable = true;