nx2/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

Browse Source
This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-05-17 19:14:01 +02:00
parent cf9af1df39 34c2a7eb4a
commit 82b8e81e92
5 changed files with 139 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -346,11 +346,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1715534503,
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"lastModified": 1715787315,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github"
},
"original": {

9
home-modules/helix.nix
View File

@@ -1,5 +1,4 @@
{ config, pkgs, pkgs-unstable, rice, ... }:
{ pkgs, pkgs-unstable, rice, ... }:
{
home = {
packages = with pkgs; [
@@ -28,6 +27,9 @@
insert = "bar";
select = "underline";
};
soft-wrap = {
enable = true;
};
line-number = "relative";
color-modes = true;
bufferline = "always";
@@ -45,6 +47,7 @@
newline = "↴";
tab = "⇥";
};
};
};
languages.language = [{
@@ -176,7 +179,7 @@
};
"ui.statusline" = {
"fg" = blue.bright;
# "bg" = black.base;
"bg" = black.base;
};
"ui.statusline.inactive" = {
"fg" = red.bright;

169
home-modules/hyprland-autoname-workspaces.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, lib, system, user, allowed, secrets, ... }:
{pkgs-unstable, lib, user, ... }:
lib.mkIf (user != "tv")
{
home.packages = [
@@ -6,92 +6,99 @@ lib.mkIf (user != "tv")
];
home.file.".config/hyprland-autoname-workspaces/config.toml".text = ''
version = "1.1.13"
version = "1.1.14"
[class]
Signal = "󱅵"
DEFAULT = "{class}"
libreoffice-writer = ""
pavucontrol = "󰕾"
"epicgameslauncher.exe" = "󰯷"
"riotclientux.exe" = "󰰌"
"[Cc]ode" = "󰨞"
VirtualBox = ""
KiCad = ""
Gimp = ""
code-oss = "󰨞"
VSCodium = "󰨞"
Alacritty = ""
kitty = ""
vesktop = "󰙯"
"cyberpunk2077.exe" = "󰾲"
"Tor Browser" = "󰾔"
"[Tt]hunderbird" = ""
Element = "󰘨"
blueman-manager = "󰂯"
obsidian = "󰠮"
libreoffice-calc = ""
zoom = "󰬡"
mpv = ""
chatterino = ""
"com.obsproject.Studio" = ""
"leagueclientux.exe" = "󰰌"
"[sS]potify" = ""
"org.remmina.Remmina" = "󰢹"
steam = "󰓓"
"galaxyclient.exe" = "󰮡"
"[Ff]irefox" = "󰈹"
pcbnew = ""
".*.exe" = ""
Chromium = ""
virt-manager = ""
Bitwarden = ""
"[tT]hunar" = ""
zathura = "󰈦"
discord = "󰙯"
"VirtualBox Manager" = ""
"org.inkscape.Inkscape" = "󰕙"
"VirtualBox Machine" = ""
lutris = "󰊗"
"[gG]imp-.*" = ""
[class]
VirtualBox = ""
steam = "󰓓"
"VirtualBox Manager" = ""
"com.obsproject.Studio" = ""
"[Ff]irefox" = "󰈹"
"[Tt]hunderbird" = ""
pcbnew = ""
".*.exe" = ""
Element = "󰘨"
Signal = "󱅵"
Gimp = ""
VSCodium = "󰨞"
"[sS]potify" = ""
virt-manager = ""
lutris = "󰊗"
DEFAULT = "{class}"
"epicgameslauncher.exe" = "󰯷"
"[Cc]ode" = "󰨞"
"galaxyclient.exe" = "󰮡"
pavucontrol = "󰕾"
"Tor Browser" = "󰾔"
mpv = ""
chatterino = ""
libreoffice-writer = ""
kitty = ""
"cyberpunk2077.exe" = "󰾲"
KiCad = ""
"[tT]hunar" = ""
"riotclientux.exe" = "󰰌"
libreoffice-calc = ""
"org.remmina.Remmina" = "󰢹"
"org.inkscape.Inkscape" = "󰕙"
"VirtualBox Machine" = ""
Bitwarden = ""
"[gG]imp-.*" = ""
Chromium = ""
obsidian = "󰠮"
"leagueclientux.exe" = "󰰌"
zathura = "󰈦"
code-oss = "󰨞"
discord = "󰙯"
vesktop = "󰙯"
blueman-manager = "󰂯"
Alacritty = ""
zoom = "󰬡"
[class_active]
"(?i)ExampleOneTerm" = "icon"
[class_active]
"(?i)ExampleOneTerm" = "icon"
[initial_class]
[initial_class]
[initial_class_active]
[initial_class_active]
[workspaces_name]
[workspaces_name]
[title_in_class]
[title_in_class_active]
[title_in_initial_class]
[title_in_initial_class_active]
[initial_title_in_class]
[initial_title_in_class_active]
[initial_title_in_initial_class]
[initial_title_in_initial_class_active]
[title_in_class]
[exclude]
"(?i)fcitx" = ".*"
aProgram = "^$"
"" = "^$"
"[Ss]team" = "^(Friends List.*)?$"
"explorer.exe" = ".*"
"(?i)TestApp" = ""
[title_in_class_active]
[format]
dedup = false
dedup_inactive_fullscreen = false
delim = " "
workspace = "{id}:{clients}"
workspace_empty = "{id}"
client = "{icon}"
client_fullscreen = "{icon}"
client_active = "{icon}"
client_dup = "{icon}{counter_sup}"
client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}"
client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}"
[title_in_initial_class]
[title_in_initial_class_active]
[initial_title_in_class]
[initial_title_in_class_active]
[initial_title_in_initial_class]
[initial_title_in_initial_class_active]
[exclude]
aProgram = "^$"
"" = "^$"
"(?i)fcitx" = ".*"
"[Ss]team" = "^(Friends List.*)?$"
"explorer.exe" = ".*"
"(?i)TestApp" = ""
[format]
dedup = false
dedup_inactive_fullscreen = false
delim = " "
workspace = "{id}:{clients}"
workspace_empty = "{id}"
client = "{icon}"
client_fullscreen = "{icon}"
client_active = "{icon}"
client_dup = "{icon}{counter_sup}"
client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}"
client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}"
'';
}
}

2
home-modules/hyprland.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }:
{ pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }:
let
animation-speed = "2";
transparency = builtins.toString rice.transparency;

74
system-modules/ollama.nix
View File

@@ -1,43 +1,51 @@
{ config, pkgs, lib, system, user, host, allowed, secrets, ... }:
{ pkgs, lib, host, nvidia, ... }:
{
environment.systemPackages = with pkgs; [
ollama
];
services.ollama.environmentVariables = {
OLLAMA_ORIGINS = "*";
};
# services.ollama.environmentVariables = {
# OLLAMA_ORIGINS = "*";
# };
systemd.services.ollama = {
environment.OLLAMA_ORIGINS = "*";
description = "Ollama Service";
after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ];
serviceConfig = {
Type = "simple";
# Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\"";
ExecStart = "${pkgs.ollama}/bin/ollama serve";
User = "ollama";
Group = "ollama";
Restart = "always";
RestartSec = "3";
# systemd.services.ollama = {
# environment.OLLAMA_ORIGINS = "*";
# description = "Ollama Service";
# after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ];
# serviceConfig = {
# Type = "simple";
# # Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\"";
# ExecStart = "${pkgs.ollama}/bin/ollama serve";
# User = "ollama";
# Group = "ollama";
# Restart = "always";
# RestartSec = "3";
# };
# wantedBy = [ "default.target" ];
# };
# users.users.ollama = {
# isSystemUser = true;
# home = "/usr/share/ollama";
# shell = "/bin/false";
# group = "ollama";
# };
# users.groups.ollama = {};
# systemd.services.ollama-doesnt-respect-xdg-data-home = {
# wantedBy = ["multi-user.target"];
# script = ''
# mkdir -p /usr/share/ollama/.ollama
# chown ollama:ollama -R /usr/share/ollama
# '';
# };
services.ollama = {
enable = true;
acceleration = lib.mkIf nvidia.enable "cuda";
listenAddress = if host == "NxACE" then "0.0.0.0:11434" else "127.0.0.1:11434";
environmentVariables = {
OLLAMA_ORIGINS = "*";
};
wantedBy = [ "default.target" ];
};
users.users.ollama = {
isSystemUser = true;
home = "/usr/share/ollama";
shell = "/bin/false";
group = "ollama";
};
users.groups.ollama = {};
systemd.services.ollama-doesnt-respect-xdg-data-home = {
wantedBy = ["multi-user.target"];
script = ''
mkdir -p /usr/share/ollama/.ollama
chown ollama:ollama -R /usr/share/ollama
'';
};
}