This commit is contained in:
Aleksandr Lebedev 2025-09-20 23:08:16 +02:00
parent 22a3f0b5de
commit d58b29cfc0
9 changed files with 107 additions and 76 deletions

106
flake.lock generated
View file

@ -324,11 +324,11 @@
"quickshell": "quickshell" "quickshell": "quickshell"
}, },
"locked": { "locked": {
"lastModified": 1758135274, "lastModified": 1758392533,
"narHash": "sha256-pipK0UDAGMTt2OrbiaZSMfVyx/L4Tjej5cNF/+9JPM4=", "narHash": "sha256-H5lHwJeUMgVmUQ8XXgwor/pYdJZahDtrMFhXlyCEiYs=",
"owner": "KyleKrein", "owner": "KyleKrein",
"repo": "DesktopShell", "repo": "DesktopShell",
"rev": "6c81aa09089befa2ce836b7596ba0d8f2a330966", "rev": "d4816bd174901cb5582151dac6ead636cf96090d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,11 +419,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757508292, "lastModified": 1758287904,
"narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1169,11 +1169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757808926, "lastModified": 1758313341,
"narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1283,11 +1283,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1758137497, "lastModified": 1758399045,
"narHash": "sha256-PibXYPPoWHnehpHWTdG4R3C6xZuXNB3703hJ9W9RzAY=", "narHash": "sha256-AlzOLxRITCu3ReEhZwW3QfdTdS71KoXATINbx41ApUk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e04396ffc1d4ce00b04eb0a37bcea568b2e7f80b", "rev": "aec2312d626dabe9cb76922bbbdc8c81dafd3600",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1365,17 +1365,19 @@
"inputs": { "inputs": {
"niri-stable": "niri-stable", "niri-stable": "niri-stable",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_10", "nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1758113295, "lastModified": 1758375815,
"narHash": "sha256-5O83S7Df8XJ0x08VLZFdSBP+vhHa9vrLMVM3tWdNVj8=", "narHash": "sha256-IAr+n58c+nfxGXmX4NRjfVfV8i5baHnB8LCWlB7XYHo=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "75513eba0b3b8185241654d835d2a9a3d174e90d", "rev": "a6b5a4263b1d6b5d1e07babd59bc66e91f492190",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1404,11 +1406,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758035401, "lastModified": 1758370089,
"narHash": "sha256-yDFq5/uwQV9NetcKduw0A/3XmGN/Z3ovMCTZkUv0B6Y=", "narHash": "sha256-0C7695SLx4hU9m3VW4fCrZdvyIY+3kFQTWELHA4hxRQ=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "08f5c6fecb3c5c81d63a0bf7248c85ae3299a4a5", "rev": "a1dccedbb72da372d2a8a84022f37ccaa4d4a6e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1465,11 +1467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758102940, "lastModified": 1758387173,
"narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", "narHash": "sha256-E5Ru709RoQEFl+Q0MHRXTIvbY0l6LSR1UHqwTulSeog=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", "rev": "7be9c1b136ef7083e60eb060be0a66dcb254e3ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1539,7 +1541,7 @@
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1757814419, "lastModified": 1757814419,
@ -1676,7 +1678,7 @@
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_8",
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1758123407, "lastModified": 1758123407,
@ -1786,11 +1788,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1757941119, "lastModified": 1758216857,
"narHash": "sha256-TssJZFzMRYdWgpHySzKv4YQg6DUv5SDENiWbVgNTo0M=", "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ff837017c3b82bd3671932599a119d7bc672ff0", "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1801,22 +1803,6 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1757745802,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1757746433, "lastModified": 1757746433,
"narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
@ -1832,7 +1818,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1757745802,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
@ -1848,13 +1834,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1758070117, "lastModified": 1758216857,
"narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1864,7 +1850,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_14": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1757746433, "lastModified": 1757746433,
"narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
@ -1880,7 +1866,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_15": { "nixpkgs_14": {
"locked": { "locked": {
"lastModified": 1751211869, "lastModified": 1751211869,
"narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
@ -4280,11 +4266,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758006913, "lastModified": 1758273351,
"narHash": "sha256-lU00BAdiKAhm96M6o0AzBdZY6+bBSfB2a0zm4xJYl/U=", "narHash": "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "49646e4407fce5925920b178872ddd9f8e495218", "rev": "e9a574d919a89602d2868621576b2ccae54a5cb0",
"revCount": 673, "revCount": 675,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@ -4334,7 +4320,7 @@
"nixos-facter-modules": "nixos-facter-modules", "nixos-facter-modules": "nixos-facter-modules",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_13", "nixpkgs": "nixpkgs_12",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"quickshell": "quickshell_2", "quickshell": "quickshell_2",
"rose-pine-hyprcursor": "rose-pine-hyprcursor", "rose-pine-hyprcursor": "rose-pine-hyprcursor",
@ -4558,7 +4544,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_14" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1758007585, "lastModified": 1758007585,
@ -4583,7 +4569,7 @@
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_6", "flake-parts": "flake-parts_6",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_15", "nixpkgs": "nixpkgs_14",
"nur": "nur", "nur": "nur",
"systems": "systems_9", "systems": "systems_9",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
@ -4868,11 +4854,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1758277210,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -69,6 +69,7 @@
}; };
niri-flake = { niri-flake = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";

View file

@ -17,11 +17,12 @@ in
enable = true; enable = true;
firstNixOSInstall = 1729112485; firstNixOSInstall = 1729112485;
}; };
nheko.enable = osConfig.custom.presets.wayland.enable; #nheko.enable = osConfig.custom.presets.wayland.enable;
xournalpp.enable = osConfig.custom.presets.wayland.enable; #xournalpp.enable = osConfig.custom.presets.wayland.enable;
librewolf.enable = osConfig.custom.presets.wayland.enable; librewolf.enable = osConfig.custom.presets.wayland.enable;
prismlauncher.enable = osConfig.custom.presets.gaming.enable; prismlauncher.enable = osConfig.custom.presets.gaming.enable;
bottles.enable = osConfig.custom.presets.wayland.enable; bottles.enable = osConfig.custom.presets.wayland.enable;
nextcloud-client.enable = osConfig.custom.presets.wayland.enable;
}; };
}; };
home = { home = {

View file

@ -27,11 +27,9 @@ in
glib glib
khal # calendar khal # calendar
gammastep # night mode gammastep # night mode
qt6ct
grim grim
slurp slurp
satty satty
libsForQt5.qt5ct
]; ];
programs.kitty = { programs.kitty = {
themeFile = lib.mkForce null; themeFile = lib.mkForce null;

View file

@ -51,12 +51,12 @@ in
]; ];
layout = { layout = {
preset-column-widths = [ preset-column-widths = [
{proportion = 1.0 / 2.0;}
{proportion = 1.0;} {proportion = 1.0;}
{proportion = 1.0 / 2.0;}
{proportion = 2.0 / 3.0;} {proportion = 2.0 / 3.0;}
{proportion = 1.0 / 3.0;} {proportion = 1.0 / 3.0;}
]; ];
default-column-width = {proportion = 1.0 / 2.0;}; default-column-width = {proportion = 1.0;};
}; };
binds = with config.lib.niri.actions; let binds = with config.lib.niri.actions; let
sh = spawn "sh" "-c"; sh = spawn "sh" "-c";
@ -373,6 +373,9 @@ in
{ {
title = "satty"; title = "satty";
} }
{
app-id = "com.gabm.satty";
}
]; ];
open-floating = true; open-floating = true;
open-focused = true; open-focused = true;
@ -398,7 +401,7 @@ in
]; ];
xwayland-satellite = { xwayland-satellite = {
enable = true; enable = true;
path = "${lib.getExe pkgs.xwayland-satellite-stable}"; path = "${lib.getExe pkgs.xwayland-satellite-unstable}";
}; };
}; };
}; };

View file

@ -32,12 +32,13 @@
"controlCenterShowNetworkIcon": true, "controlCenterShowNetworkIcon": true,
"controlCenterShowBluetoothIcon": true, "controlCenterShowBluetoothIcon": true,
"controlCenterShowAudioIcon": true, "controlCenterShowAudioIcon": true,
"showWorkspaceIndex": false, "showWorkspaceIndex": true,
"showWorkspacePadding": false, "showWorkspacePadding": false,
"showWorkspaceApps": true, "showWorkspaceApps": true,
"maxWorkspaceIcons": 30, "maxWorkspaceIcons": 30,
"workspacesPerMonitor": true, "workspacesPerMonitor": true,
"workspaceNameIcons": {}, "workspaceNameIcons": {},
"waveProgressEnabled": true,
"clockCompactMode": false, "clockCompactMode": false,
"focusedWindowCompactMode": false, "focusedWindowCompactMode": false,
"runningAppsCompactMode": true, "runningAppsCompactMode": true,
@ -105,7 +106,7 @@
"spotlightModalViewMode": "list", "spotlightModalViewMode": "list",
"networkPreference": "auto", "networkPreference": "auto",
"iconTheme": "System Default", "iconTheme": "System Default",
"useOSLogo": false, "useOSLogo": true,
"osLogoColorOverride": "", "osLogoColorOverride": "",
"osLogoBrightness": 0.5, "osLogoBrightness": 0.5,
"osLogoContrast": 1, "osLogoContrast": 1,
@ -114,6 +115,9 @@
"monoFontFamily": "Fira Code", "monoFontFamily": "Fira Code",
"fontWeight": 400, "fontWeight": 400,
"fontScale": 1, "fontScale": 1,
"notepadUseMonospace": true,
"notepadFontFamily": "",
"notepadFontSize": 14,
"gtkThemingEnabled": true, "gtkThemingEnabled": true,
"qtThemingEnabled": true, "qtThemingEnabled": true,
"showDock": false, "showDock": false,
@ -121,17 +125,25 @@
"cornerRadius": 12, "cornerRadius": 12,
"notificationOverlayEnabled": false, "notificationOverlayEnabled": false,
"topBarAutoHide": false, "topBarAutoHide": false,
"topBarOpenOnOverview": false, "topBarOpenOnOverview": true,
"topBarVisible": true, "topBarVisible": true,
"topBarSpacing": 4, "topBarSpacing": 4,
"topBarBottomGap": 0, "topBarBottomGap": 0,
"topBarInnerPadding": 8, "topBarInnerPadding": 8,
"topBarSquareCorners": false, "topBarSquareCorners": false,
"topBarNoBackground": false, "topBarNoBackground": false,
"topBarGothCornersEnabled": false,
"lockScreenShowPowerActions": true, "lockScreenShowPowerActions": true,
"hideBrightnessSlider": false, "hideBrightnessSlider": false,
"notificationTimeoutLow": 5000, "notificationTimeoutLow": 5000,
"notificationTimeoutNormal": 5000, "notificationTimeoutNormal": 5000,
"notificationTimeoutCritical": 0, "notificationTimeoutCritical": 0,
"screenPreferences": {} "screenPreferences": {
"notifications": [
"all"
],
"toast": [
"all"
]
}
} }

View file

@ -0,0 +1,30 @@
{
lib,
pkgs,
inputs,
namespace,
system,
target,
format,
virtual,
systems,
config,
...
}:
with lib;
with lib.${namespace}; let
cfg = config.${namespace}.programs.nextcloud-client;
impermanence = config.${namespace}.impermanence;
in {
options.${namespace}.programs.nextcloud-client = with types; {
enable = mkBoolOpt false "Enable nextcloud-client";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [nextcloud-client];
home.persistence = mkIf impermanence.enable {
"${impermanence.persistentStorage}".directories = [
];
};
};
}

View file

@ -26,7 +26,7 @@ in {
security.pam.services.quickshell = {}; security.pam.services.quickshell = {};
programs.niri = { programs.niri = {
enable = true; enable = true;
package = pkgs.niri-stable; package = pkgs.niri-unstable;
}; };
niri-flake.cache.enable = true; niri-flake.cache.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -34,7 +34,7 @@ in {
wayland-utils wayland-utils
libsecret libsecret
gamescope gamescope
xwayland-satellite-stable xwayland-satellite-unstable
]; ];
#greeter #greeter

View file

@ -60,11 +60,11 @@ in
video-downloader video-downloader
]; ];
services.fprintd.enable = true; #services.fprintd.enable = true;
#services.fprintd.tod.enable = true; #services.fprintd.tod.enable = true;
#services.fprintd.tod.driver = pkgs.libfprint-2-tod1-elan; #services.fprintd.tod.driver = pkgs.libfprint-2-tod1-elan;
#services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
#services.tlp.enable = false; services.tlp.enable = false;
#Chat host #Chat host
networking.firewall.allowedTCPPorts = [80 443 22 8448 9993 8081]; networking.firewall.allowedTCPPorts = [80 443 22 8448 9993 8081];