Merge branch 'main' of github.com:asosnovsky/nixos-setup

This commit is contained in:
ari committed 2025-12-31 14:44:47 -05:00
commit 711f4b71af
23 files changed
+281 -378

No files matched your search

-2
View File
@@ -264,8 +264,6 @@ binds {
Print { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; }
Mod+P { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; }
//Print { spawn "sh" "-c" "flameshot gui"; }
//Mod+P { spawn "sh" "-c" "flameshot gui"; }
Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; }
Ctrl+Alt+Delete { quit; }
+5
View File
@@ -0,0 +1,5 @@
recent-windows {
highlight {
corner-radius 12
}
}
+36
View File
@@ -0,0 +1,36 @@
layout {
background-color "transparent"
focus-ring {
active-color "#f9e2af"
inactive-color "#6c7086"
urgent-color "#f2b8b5"
}
border {
active-color "#f9e2af"
inactive-color "#6c7086"
urgent-color "#f2b8b5"
}
shadow {
color "#00000070"
}
tab-indicator {
active-color "#f9e2af"
inactive-color "#6c7086"
urgent-color "#f2b8b5"
}
insert-hint {
color "#f9e2af80"
}
}
recent-windows {
highlight {
active-color "#6e5a2f"
urgent-color "#f2b8b5"
}
}
+17
View File
@@ -0,0 +1,17 @@
layout {
gaps 4
border {
width 2
}
focus-ring {
width 2
}
}
window-rule {
geometry-corner-radius 12
clip-to-geometry true
tiled-state true
draw-border-with-background false
}
+4
View File
@@ -0,0 +1,4 @@
layer-rule {
match namespace="dms:blurwallpaper"
place-within-backdrop true
}
+3 -3
View File
@@ -3,9 +3,9 @@
killall -q waybar
sleep 1
waybar --config /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.jsonc &
waybar --config /home/ari/nixos-setup/configs/niri/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/top-bar.css &
waypaper --restore
# waybar --config /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.jsonc &
# waybar --config /home/ari/nixos-setup/configs/niri/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/top-bar.css &
# waypaper --restore
killall -q hypridle
hypridle &
-47
View File
@@ -1,47 +0,0 @@
[default_apps]
teams = "teams-for-linux --enable-features=UseOzonePlatform --ozone-platform=wayland --url {meeting_url}"
calendar_client = "thunderbird"
terminal = "ghostty"
browser = "chromium %U"
[units]
lengths = "meters"
weights = "kg"
volumes = "l"
temperatures = "C"
_currency = "cad"
[debug]
try_suppress_errors = false
try_suppress_warnings = false
app_paths = []
[appearance]
width = 900
height = 593
gsk_renderer = "cairo"
icon_paths = ["~/.config/sherlock/p'picons/"]
icon_size = 22
search_icon = false
use_base_css = true
status_bar = true
opacity = 1.0
mod_key_ascii = ["⇧", "⇧", "⌘", "⌘", "⎇", "✦", "✦", "⌘"]
[behavior]
cache = "~/.cache/sherlock/sherlock_desktop_cache.json"
caching = false
daemonize = false
animate = true
[binds]
[files]
config = "~/.config/sherlock/config.toml"
css = "~/.config/sherlock/main.css"
fallback = "~/.config/sherlock/fallback.json"
alias = "~/.config/sherlock/sherlock_alias.json"
ignore = "~/.config/sherlock/sherlockignore"
actions = "~/.config/sherlock/sherlock_actions.json"
[pipe]
-208
View File
@@ -1,208 +0,0 @@
[
{
"name": "Weather",
"type": "weather",
"args": {
"location": "berlin",
"update_interval": 60
},
"priority": 1,
"home": true,
"only_home": true,
"async": true,
"shortcut": false,
"spawn_focus": false
},
{
"name": "Teams Event",
"type": "teams_event",
"args": {
"event_date": "now",
"event_start": "-5 minutes",
"event_end": "+15 minutes"
},
"priority": 1,
"home": true
},
{
"name": "Calculator",
"type": "calculation",
"args": {
"capabilities": [
"calc.math",
"calc.units"
]
},
"priority": 1
},
{
"name": "Spotify",
"type": "audio_sink",
"args": {},
"async": true,
"priority": 1,
"home": true,
"only_home": true,
"spawn_focus": false
},
{
"name": "Clipboard",
"type": "clipboard-execution",
"args": {
"capabilities": [
"url",
"colors.hex",
"colors.rgb",
"colors.hsl",
"calc.math",
"calc.lengths",
"calc.weights",
"calc.temperatures"
]
},
"priority": 1,
"home": true
},
{
"name": "App Launcher",
"alias": "app",
"type": "app_launcher",
"args": {},
"priority": 2,
"home": true
},
{
"name": "Categories",
"alias": "cat",
"type": "categories",
"args": {
"Kill Processes": {
"icon": "sherlock-process",
"icon_class": "reactive",
"exec": "kill",
"search_string": "terminate;kill;process"
},
"Power Menu": {
"icon": "battery-full-symbolic",
"icon_class": "reactive",
"exec": "pm",
"search_string": "powermenu;"
}
},
"priority": 3,
"home": true
},
{
"name": "Kill Process",
"alias": "kill",
"type": "process",
"args": {},
"priority": 0
},
{
"name": "Power Management",
"alias": "pm",
"type": "command",
"args": {
"commands": {
"Shutdown": {
"icon": "system-shutdown",
"icon_class": "reactive",
"exec": "systemctl poweroff",
"search_string": "Poweroff;Shutdown"
},
"Sleep": {
"icon": "system-suspend",
"icon_class": "reactive",
"exec": "systemctl suspend",
"search_string": "Sleep;"
},
"Lock": {
"icon": "system-lock-screen",
"icon_class": "reactive",
"exec": "systemctl suspend & swaylock",
"search_string": "Lock Screen;"
},
"Reboot": {
"icon": "system-reboot",
"icon_class": "reactive",
"exec": "systemctl reboot",
"search_string": "reboot;restart"
},
"Log Oout": {
"icon": "system-log-out",
"icon_class": "reactive",
"exec": "hyprctl dispatch exit",
"search_string": "logout;exit"
}
}
},
"priority": 5
},
{
"name": "Web Search",
"display_name": "Google Search",
"tag_start": "{keyword}",
"tag_end": "{keyword}",
"alias": "gg",
"type": "web_launcher",
"args": {
"search_engine": "google",
"icon": "google"
},
"priority": 100
},
{
"name": "Debug",
"type": "debug",
"alias": "debug",
"args": {
"commands": {
"Show Errors": {
"icon": "sherlock-process",
"exec": "show_errors",
"search_string": "debug;errors"
},
"Clear Cache": {
"icon": "sherlock-process",
"exec": "clear_cache",
"search_string": "clear;cache;"
},
"Reset App Counts": {
"icon": "sherlock-process",
"exec": "reset_counts",
"search_string": "reset;clear;counts;appcounts"
}
}
},
"priority": 0
},
{
"name": "Categories",
"alias": "cat",
"type": "categories",
"args": {
"categories": {
"Kill Processes": {
"icon": "sherlock-process",
"exec": "kill",
"search_string": "terminate;kill;process"
},
"Power Menu": {
"icon": "battery-full-symbolic",
"icon_class": "reactive",
"exec": "pm",
"search_string": "powermenu;"
},
"Debug": {
"icon": "tools-report-bug",
"icon_class": "reactive",
"exec": "debug",
"search_string": "debug;error"
}
}
},
"priority": 3,
"home": true
}
]
View File
Whitespace-only changes.
Whitespace-only changes.
-1
View File
@@ -1 +0,0 @@
{}
View File
Whitespace-only changes.
Generated
+67
View File
@@ -158,6 +158,50 @@
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux"
}
},
"dgop": {
"inputs": {
"nixpkgs": [
"dms",
"nixpkgs"
]
},
"locked": {
"lastModified": 1762835999,
"narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=",
"owner": "AvengeMedia",
"repo": "dgop",
"rev": "799301991cd5dcea9b64245f9d500dcc76615653",
"type": "github"
},
"original": {
"owner": "AvengeMedia",
"repo": "dgop",
"type": "github"
}
},
"dms": {
"inputs": {
"dgop": "dgop",
"nixpkgs": [
"nixpkgs-unstable"
],
"quickshell": "quickshell"
},
"locked": {
"lastModified": 1765552734,
"narHash": "sha256-rWjWYu5rs3ZOJ4YJpvIscBZSYu74thJHc0VYyYKJTUc=",
"owner": "AvengeMedia",
"repo": "DankMaterialShell",
"rev": "7fb358bada0d3a229ec5ee6aaad0f9b64f367331",
"type": "github"
},
"original": {
"owner": "AvengeMedia",
"ref": "stable",
"repo": "DankMaterialShell",
"type": "github"
}
},
"firefox-gnome-theme": {
"flake": false,
"locked": {
@@ -753,9 +797,32 @@
"type": "github"
}
},
"quickshell": {
"inputs": {
"nixpkgs": [
"dms",
"nixpkgs"
]
},
"locked": {
"lastModified": 1764663772,
"narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
"ref": "refs/heads/master",
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
"revCount": 713,
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
},
"original": {
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
}
},
"root": {
"inputs": {
"determinate": "determinate",
"dms": "dms",
"home-manager": "home-manager",
"hyprlauncher": "hyprlauncher",
"nix-darwin": "nix-darwin",
+7
View File
@@ -7,6 +7,11 @@
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0";
nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
# DankShell
dms = {
url = "github:AvengeMedia/DankMaterialShell/stable";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Flatpak
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main";
# Home manager
@@ -41,6 +46,7 @@
nix-flatpak,
stylix,
hyprlauncher,
dms,
}:
let
user = {
@@ -94,6 +100,7 @@
inherit
hyprlauncher
nixpkgs-unstable
dms
;
};
};
+3 -3
View File
@@ -42,9 +42,9 @@ in
enable = true;
hyprland.enable = true;
niri.enable = true;
background = {
enable = true;
};
# background = {
# enable = true;
# };
};
};
};
+14 -11
View File
@@ -1,8 +1,7 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
with lib;
@@ -52,12 +51,16 @@ in
in
mkIf cfg.user.enable {
programs.zsh.enable = true;
home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
pkgs = pkgs;
};
home-manager.backupFileExtension = ".bak";
home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
home-manager = {
backupFileExtension = ".bak";
useGlobalPkgs = true;
useUserPackages = true;
users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
pkgs = pkgs;
};
users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
};
};
}
+5 -7
View File
@@ -47,17 +47,15 @@ in
};
makeCommonUser =
{
fullName,
email,
extraGitConfigs ? [ ],
name,
...
{ fullName
, email
, extraGitConfigs ? [ ]
, name
, ...
}@user:
{ pkgs, ... }:
{
fonts = fontsModule;
# xdg.configFile."mimeapps.list".force = true;
home = homeModule // {
username = name;
homeDirectory = "/home/${name}";
+55 -35
View File
@@ -7,28 +7,37 @@
, nix-flatpak
, specialArgs
, stylix
,
}:
let
skygUtils = import ./skyg-utils.nix;
makeImports =
{ attrs
, extraConfiguration ? [ ]
}: (if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
++ [
,
}:
(if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
++ [
(import ./main.nix attrs)
] ++ extraConfiguration;
]
++ extraConfiguration;
eachSystem = nixpkgs.lib.genAttrs (import systems);
allPkgs = eachSystem (system:
allPkgs = eachSystem (
system:
import nixpkgs {
system = system;
config = { allowUnfree = true; };
});
config = {
allowUnfree = true;
};
}
);
makeNixOsModuleMaker =
masterAttrs:
{ system ? masterAttrs.system ? "x86_64-linux"
, ...
}@attrs:
let joinedttrs = masterAttrs // attrs;
let
joinedttrs = masterAttrs // attrs;
in
nixpkgs.lib.nixosSystem {
specialArgs = specialArgs // {
@@ -38,16 +47,17 @@ let
modules = [
determinate.nixosModules.default
stylix.nixosModules.stylix
] ++ (makeImports {
]
++ (makeImports {
attrs = joinedttrs;
extraConfiguration = [
home-manager.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
specialArgs.dms.nixosModules.dankMaterialShell
];
});
};
makeNixOsModule =
makeNixOsModuleMaker { };
makeNixOsModule = makeNixOsModuleMaker { };
makeHLService = makeNixOsModuleMaker hlCommonSettings;
makeDarwinModule =
{ system ? "x86_64-darwin"
@@ -55,36 +65,42 @@ let
, ...
}@attrs:
nix-darwin.lib.darwinSystem {
modules = (makeImports {
attrs = attrs;
extraConfiguration = [
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
];
}) ++ [
(import ./macos.nix {
user = user;
system = system;
modules =
(makeImports {
attrs = attrs;
extraConfiguration = [
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
];
})
];
++ [
(import ./macos.nix {
user = user;
system = system;
})
];
};
makeHomeManagerUsers =
{ modules ? [ ]
, homeManagerVersion
, user
, system ? "x86_64-linux"
,
}:
let
hm = (import ./home {
stateVersion = homeManagerVersion;
});
hm = (
import ./home {
stateVersion = homeManagerVersion;
}
);
pkgs = allPkgs."${system}";
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(hm.makeCommonUser user)
] ++ modules;
]
++ modules;
};
in
{
@@ -98,14 +114,18 @@ in
{ nodeNames ? [ ]
, systemStateVersion ? "24.05"
, user
}: builtins.listToAttrs (builtins.map
(name: {
name = name;
value = makeHLService {
hostName = name;
configuration = (import (../hosts + "/${name}.nix") { user = user; });
systemStateVersion = systemStateVersion;
};
})
nodeNames);
,
}:
builtins.listToAttrs (
builtins.map
(name: {
name = name;
value = makeHLService {
hostName = name;
configuration = (import (../hosts + "/${name}.nix") { user = user; });
systemStateVersion = systemStateVersion;
};
})
nodeNames
);
}
+3 -4
View File
@@ -1,7 +1,6 @@
{
lib,
config,
...
{ lib
, config
, ...
}:
let
cfg = config.skyg.nixos.common.hardware.pipewire;
+4 -5
View File
@@ -1,8 +1,7 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.skyg.nixos;
+47 -39
View File
@@ -1,4 +1,8 @@
{ config, lib, pkgs, ... }:
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.skyg.nixos.desktop.tiler;
in
@@ -10,46 +14,50 @@ in
];
options = {
skyg.nixos.desktop.tiler = {
enable = lib.mkEnableOption
"Enable libraries for tiling window managers";
enable = lib.mkEnableOption "Enable libraries for tiling window managers";
};
};
config = lib.mkIf cfg.enable
{
users.users.${config.skyg.user.name} = {
extraGroups = [
"input"
];
};
# services.blueman.enable = true;
programs.hyprlock.enable = true;
programs.nm-applet.enable = true;
environment.systemPackages = with pkgs; [
# Protocols and libraries
xwayland-satellite
libnotify
# Notifications
mako
wofi
rofi
# Control Tools
pavucontrol
playerctl
brightnessctl
networkmanagerapplet
blueman
# Apps
walker
waybar
nwg-bar
gnome-calendar
nautilus
# Screen capture and recording tools
(flameshot.override { enableWlrSupport = true; })
grim
slurp
satty
wf-recorder
config = lib.mkIf cfg.enable {
users.users.${config.skyg.user.name} = {
extraGroups = [
"input"
];
};
# services.blueman.enable = true;
programs.dankMaterialShell = {
enable = true;
systemd = {
enable = true; # Systemd service for auto-start
restartIfChanged = true; # Auto-restart dms.service when dankMaterialShell changes
};
};
# programs.hyprlock.enable = true;
# programs.nm-applet.enable = true;
environment.systemPackages = with pkgs; [
# Protocols and libraries
xwayland-satellite
libnotify
# Notifications
mako
wofi
rofi
# Control Tools
pavucontrol
playerctl
brightnessctl
# networkmanagerapplet
blueman
# Apps
walker
# waybar
# nwg-bar
gnome-calendar
nautilus
# Screen capture and recording tools
grim
slurp
satty
wf-recorder
];
};
}
+4 -5
View File
@@ -1,8 +1,7 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.skyg.nixos.desktop.tiler.hyprland;
+7 -8
View File
@@ -1,11 +1,10 @@
{
config,
lib,
pkgs,
skygUtils,
system,
nixpkgs-unstable,
...
{ config
, lib
, pkgs
, skygUtils
, system
, nixpkgs-unstable
, ...
}:
let
cfg = config.skyg.nixos.desktop.tiler.niri;