diff --git a/flake.lock b/flake.lock index 9f54fa0..4cea23b 100644 --- a/flake.lock +++ b/flake.lock @@ -324,11 +324,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1758135274, - "narHash": "sha256-pipK0UDAGMTt2OrbiaZSMfVyx/L4Tjej5cNF/+9JPM4=", + "lastModified": 1758392533, + "narHash": "sha256-H5lHwJeUMgVmUQ8XXgwor/pYdJZahDtrMFhXlyCEiYs=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "6c81aa09089befa2ce836b7596ba0d8f2a330966", + "rev": "d4816bd174901cb5582151dac6ead636cf96090d", "type": "github" }, "original": { @@ -419,11 +419,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1758313341, + "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", "type": "github" }, "original": { @@ -1283,11 +1283,11 @@ }, "master": { "locked": { - "lastModified": 1758137497, - "narHash": "sha256-PibXYPPoWHnehpHWTdG4R3C6xZuXNB3703hJ9W9RzAY=", + "lastModified": 1758399045, + "narHash": "sha256-AlzOLxRITCu3ReEhZwW3QfdTdS71KoXATINbx41ApUk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e04396ffc1d4ce00b04eb0a37bcea568b2e7f80b", + "rev": "aec2312d626dabe9cb76922bbbdc8c81dafd3600", "type": "github" }, "original": { @@ -1365,17 +1365,19 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_10", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758113295, - "narHash": "sha256-5O83S7Df8XJ0x08VLZFdSBP+vhHa9vrLMVM3tWdNVj8=", + "lastModified": 1758375815, + "narHash": "sha256-IAr+n58c+nfxGXmX4NRjfVfV8i5baHnB8LCWlB7XYHo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "75513eba0b3b8185241654d835d2a9a3d174e90d", + "rev": "a6b5a4263b1d6b5d1e07babd59bc66e91f492190", "type": "github" }, "original": { @@ -1404,11 +1406,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758035401, - "narHash": "sha256-yDFq5/uwQV9NetcKduw0A/3XmGN/Z3ovMCTZkUv0B6Y=", + "lastModified": 1758370089, + "narHash": "sha256-0C7695SLx4hU9m3VW4fCrZdvyIY+3kFQTWELHA4hxRQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "08f5c6fecb3c5c81d63a0bf7248c85ae3299a4a5", + "rev": "a1dccedbb72da372d2a8a84022f37ccaa4d4a6e6", "type": "github" }, "original": { @@ -1465,11 +1467,11 @@ ] }, "locked": { - "lastModified": 1758102940, - "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", + "lastModified": 1758387173, + "narHash": "sha256-E5Ru709RoQEFl+Q0MHRXTIvbY0l6LSR1UHqwTulSeog=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", + "rev": "7be9c1b136ef7083e60eb060be0a66dcb254e3ca", "type": "github" }, "original": { @@ -1539,7 +1541,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1757814419, @@ -1676,7 +1678,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1758123407, @@ -1786,11 +1788,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1757941119, - "narHash": "sha256-TssJZFzMRYdWgpHySzKv4YQg6DUv5SDENiWbVgNTo0M=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ff837017c3b82bd3671932599a119d7bc672ff0", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { @@ -1801,22 +1803,6 @@ } }, "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": { "lastModified": 1757746433, "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", @@ -1832,7 +1818,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1757745802, "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", @@ -1848,13 +1834,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { - "lastModified": 1758070117, - "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { @@ -1864,7 +1850,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1757746433, "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", @@ -1880,7 +1866,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1751211869, "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", @@ -4280,11 +4266,11 @@ ] }, "locked": { - "lastModified": 1758006913, - "narHash": "sha256-lU00BAdiKAhm96M6o0AzBdZY6+bBSfB2a0zm4xJYl/U=", + "lastModified": 1758273351, + "narHash": "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ=", "ref": "refs/heads/master", - "rev": "49646e4407fce5925920b178872ddd9f8e495218", - "revCount": 673, + "rev": "e9a574d919a89602d2868621576b2ccae54a5cb0", + "revCount": 675, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -4334,7 +4320,7 @@ "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "pre-commit-hooks": "pre-commit-hooks", "quickshell": "quickshell_2", "rose-pine-hyprcursor": "rose-pine-hyprcursor", @@ -4558,7 +4544,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1758007585, @@ -4583,7 +4569,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_6", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "nur": "nur", "systems": "systems_9", "tinted-foot": "tinted-foot", @@ -4868,11 +4854,11 @@ }, "unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 33a10fa..a37bbf2 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ }; niri-flake = { url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; diff --git a/homes/x86_64-linux/kylekrein/default.nix b/homes/x86_64-linux/kylekrein/default.nix index 4b80b5e..4fc9203 100644 --- a/homes/x86_64-linux/kylekrein/default.nix +++ b/homes/x86_64-linux/kylekrein/default.nix @@ -17,11 +17,12 @@ in enable = true; firstNixOSInstall = 1729112485; }; - nheko.enable = osConfig.custom.presets.wayland.enable; - xournalpp.enable = osConfig.custom.presets.wayland.enable; + #nheko.enable = osConfig.custom.presets.wayland.enable; + #xournalpp.enable = osConfig.custom.presets.wayland.enable; librewolf.enable = osConfig.custom.presets.wayland.enable; prismlauncher.enable = osConfig.custom.presets.gaming.enable; bottles.enable = osConfig.custom.presets.wayland.enable; + nextcloud-client.enable = osConfig.custom.presets.wayland.enable; }; }; home = { diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 6ac8f87..1aea583 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -27,11 +27,9 @@ in glib khal # calendar gammastep # night mode - qt6ct grim slurp satty - libsForQt5.qt5ct ]; programs.kitty = { themeFile = lib.mkForce null; diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 6b7d688..e49d214 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -51,12 +51,12 @@ in ]; layout = { preset-column-widths = [ - {proportion = 1.0 / 2.0;} {proportion = 1.0;} + {proportion = 1.0 / 2.0;} {proportion = 2.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 sh = spawn "sh" "-c"; @@ -373,6 +373,9 @@ in { title = "satty"; } + { + app-id = "com.gabm.satty"; + } ]; open-floating = true; open-focused = true; @@ -398,7 +401,7 @@ in ]; xwayland-satellite = { enable = true; - path = "${lib.getExe pkgs.xwayland-satellite-stable}"; + path = "${lib.getExe pkgs.xwayland-satellite-unstable}"; }; }; }; diff --git a/homes/x86_64-linux/kylekrein/niri/settings.json b/homes/x86_64-linux/kylekrein/niri/settings.json index c2b22df..eff7ae4 100644 --- a/homes/x86_64-linux/kylekrein/niri/settings.json +++ b/homes/x86_64-linux/kylekrein/niri/settings.json @@ -32,12 +32,13 @@ "controlCenterShowNetworkIcon": true, "controlCenterShowBluetoothIcon": true, "controlCenterShowAudioIcon": true, - "showWorkspaceIndex": false, + "showWorkspaceIndex": true, "showWorkspacePadding": false, "showWorkspaceApps": true, "maxWorkspaceIcons": 30, "workspacesPerMonitor": true, "workspaceNameIcons": {}, + "waveProgressEnabled": true, "clockCompactMode": false, "focusedWindowCompactMode": false, "runningAppsCompactMode": true, @@ -105,7 +106,7 @@ "spotlightModalViewMode": "list", "networkPreference": "auto", "iconTheme": "System Default", - "useOSLogo": false, + "useOSLogo": true, "osLogoColorOverride": "", "osLogoBrightness": 0.5, "osLogoContrast": 1, @@ -114,6 +115,9 @@ "monoFontFamily": "Fira Code", "fontWeight": 400, "fontScale": 1, + "notepadUseMonospace": true, + "notepadFontFamily": "", + "notepadFontSize": 14, "gtkThemingEnabled": true, "qtThemingEnabled": true, "showDock": false, @@ -121,17 +125,25 @@ "cornerRadius": 12, "notificationOverlayEnabled": false, "topBarAutoHide": false, - "topBarOpenOnOverview": false, + "topBarOpenOnOverview": true, "topBarVisible": true, "topBarSpacing": 4, "topBarBottomGap": 0, "topBarInnerPadding": 8, "topBarSquareCorners": false, "topBarNoBackground": false, + "topBarGothCornersEnabled": false, "lockScreenShowPowerActions": true, "hideBrightnessSlider": false, "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, "notificationTimeoutCritical": 0, - "screenPreferences": {} + "screenPreferences": { + "notifications": [ + "all" + ], + "toast": [ + "all" + ] + } } \ No newline at end of file diff --git a/modules/home/programs/nextcloud-client/default.nix b/modules/home/programs/nextcloud-client/default.nix new file mode 100644 index 0000000..2ee6550 --- /dev/null +++ b/modules/home/programs/nextcloud-client/default.nix @@ -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 = [ + ]; + }; + }; +} diff --git a/modules/nixos/windowManagers/niri/default.nix b/modules/nixos/windowManagers/niri/default.nix index 826b184..59bc8d2 100644 --- a/modules/nixos/windowManagers/niri/default.nix +++ b/modules/nixos/windowManagers/niri/default.nix @@ -26,7 +26,7 @@ in { security.pam.services.quickshell = {}; programs.niri = { enable = true; - package = pkgs.niri-stable; + package = pkgs.niri-unstable; }; niri-flake.cache.enable = true; environment.systemPackages = with pkgs; [ @@ -34,7 +34,7 @@ in { wayland-utils libsecret gamescope - xwayland-satellite-stable + xwayland-satellite-unstable ]; #greeter diff --git a/systems/x86_64-linux/kylekrein-framework12/default.nix b/systems/x86_64-linux/kylekrein-framework12/default.nix index 2ad0ddf..251e037 100644 --- a/systems/x86_64-linux/kylekrein-framework12/default.nix +++ b/systems/x86_64-linux/kylekrein-framework12/default.nix @@ -60,11 +60,11 @@ in video-downloader ]; - services.fprintd.enable = true; + #services.fprintd.enable = true; #services.fprintd.tod.enable = true; #services.fprintd.tod.driver = pkgs.libfprint-2-tod1-elan; - #services.power-profiles-daemon.enable = true; - #services.tlp.enable = false; + services.power-profiles-daemon.enable = true; + services.tlp.enable = false; #Chat host networking.firewall.allowedTCPPorts = [80 443 22 8448 9993 8081];