diff --git a/flake.lock b/flake.lock index 7d674c4..ea99fbb 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1771513958, - "narHash": "sha256-KoDcVuYgmP/kX6pd9uCW5Wo5Xn3y0SumrMaCLu5ojdY=", + "lastModified": 1771215876, + "narHash": "sha256-aei7McII5+y4tROXfmOVyLbPO62sWttNkOKUlCSEIcg=", "owner": "nyakase", "repo": "aerothemeplasma-nix", - "rev": "348cbf661738840d0ae02d5eda7f4c076e59b733", + "rev": "b922785202501754c4503232aa5f172aeaef8b00", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771511514, - "narHash": "sha256-qhtonMK07BCVC/wZ+pZ9/MKhcTric7YUaCpW6pOg8IM=", + "lastModified": 1771054135, + "narHash": "sha256-0RYmnOk40U4ZGbW/+3rHlNndrsuHCz9h+xequKWgwHQ=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "2b92d495204be0b10845c66361444dbc8441c68d", + "rev": "357186cca0f4c7801ff16970e4b6a05e74fd88e0", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "base16-discord": { "flake": false, "locked": { - "lastModified": 1771164756, - "narHash": "sha256-6NU5HQZVZ1mSNaIyZxE+U35nF46uXH/768y3auhQdiI=", + "lastModified": 1768273180, + "narHash": "sha256-uw7lz53YHxvPEyXZiS+NJFhKMb6AMUvVpCLH81NjM7U=", "owner": "imbypass", "repo": "base16-discord", - "rev": "8b005607e5783f751fe369f0442965a86eed8051", + "rev": "d4df17db31276d94cc1a8988f34e813aae1f3fb4", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1771399550, - "narHash": "sha256-Q2rMJcwZiI1rn8H27gLleKA3ATW/EykukyGR6S1tBPk=", + "lastModified": 1771246613, + "narHash": "sha256-GftqKiyIgMcSgVkbNqXQq7oNnoL1+EB9V71XG4lPBRs=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "021aae790c8555a4bb6e2135c6b777bf6fdcba02", + "rev": "cb320a13e3c92f32ada27acb1fba8a828a22ae60", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "catppuccin-discord": { "flake": false, "locked": { - "lastModified": 1770426312, - "narHash": "sha256-rxvHIifq5CYIBPwFA2SpOrWT+sG/z0ItXT3sx2wbEqg=", + "lastModified": 1769446491, + "narHash": "sha256-7v1Hu6QofOyFOGnHeqHFK0JsxUxdJ9uTjI7nM7mdTsg=", "owner": "catppuccin", "repo": "discord", - "rev": "b9b5547f0b32296d2389716ef606de87b3c1e7c7", + "rev": "f235754322320211a8646d963466fac402e5c297", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1771519029, - "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", + "lastModified": 1769579508, + "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", "owner": "nix-community", "repo": "home-manager", - "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", + "rev": "eec72f127831326b042d1f35003767a4ab6a9516", "type": "github" }, "original": { @@ -325,11 +325,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1771438239, - "narHash": "sha256-/d5FnrQ1nvZ9n1I7o/hMTzjd8tTBvV5rT24Nh7h59RQ=", + "lastModified": 1771353108, + "narHash": "sha256-5Xtei4UKrqRC6IYLgI1KEBaPN9Xfef5JeOexdqDWVeg=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "58f338b00bc5619144a6f3082eed5c83e79b279b", + "rev": "98e777cdcc39e6bd0312a9d756507ef9cbd284cb", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1771419570, - "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1771135771, - "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", + "lastModified": 1769537308, + "narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=", "owner": "nix-community", "repo": "nixvim", - "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", + "rev": "7addac6d111837217c16762968a9042eac703f7e", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1771513929, - "narHash": "sha256-dPeHevAT1Cb2w/Wrfz/d5i6RfO8bvbGl/KrTPxU2l3w=", + "lastModified": 1769607092, + "narHash": "sha256-P0KGVjKtN+hkZWskpxr2iXWalPb0SKAgRVyMFZxdxf0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9c47ce03f200e0b8fc515d973440d5bc3e359785", + "rev": "b2b16ecdda1bc04001a7c714bf8124160a86ddfc", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1771516225, - "narHash": "sha256-G2cPs4Ic8Z1Aq8QfMa1VwJoBwIhVpwzcQ036ZhI4oXc=", + "lastModified": 1769604042, + "narHash": "sha256-KQGbmKSY3tA4S8qFN76xd+3cbM0mAtPgoUVbjWrprcs=", "owner": "nix-community", "repo": "NUR", - "rev": "d4694f0614419034910767b5a036384ab358b138", + "rev": "92f5f3f18a365341dd424314a80253f5ede071e4", "type": "github" }, "original": { @@ -509,7 +509,6 @@ "original": { "owner": "OpenMW", "repo": "openmw", - "rev": "01bcd6a6369fe461caaf900354967b4751aede7a", "type": "gitlab" } }, @@ -523,11 +522,11 @@ ] }, "locked": { - "lastModified": 1770766818, - "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", + "lastModified": 1767662275, + "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "44b928068359b7d2310a34de39555c63c93a2c90", + "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", "type": "github" }, "original": { @@ -569,11 +568,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1771268051, - "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", + "lastModified": 1769316930, + "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", + "rev": "b2ce438f386943ef611e196a178af2d79042903b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c96b188..e1733a6 100644 --- a/flake.nix +++ b/flake.nix @@ -87,7 +87,7 @@ }; openmw = { - url = "gitlab:OpenMW/openmw/01bcd6a6369fe461caaf900354967b4751aede7a"; + url = "gitlab:OpenMW/openmw"; flake = false; }; diff --git a/home/apps/discord.nix b/home/apps/discord.nix index e488076..c0c6683 100644 --- a/home/apps/discord.nix +++ b/home/apps/discord.nix @@ -4,9 +4,12 @@ ... }: let + catppuccin-discord = "${pkgs.catppuccin-discord}/share/catppuccin-discord/catppuccin-mocha-*.theme.css"; + mergedThemes = pkgs.runCommand "mergedConfig" { } '' mkdir -p $out cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css + cp -rvf ${catppuccin-discord} $out ''; vesktopSettings = { diff --git a/home/default.nix b/home/default.nix index dffbadd..f714d1c 100755 --- a/home/default.nix +++ b/home/default.nix @@ -39,7 +39,7 @@ ffmpeg-full # kde and kde theming - # kde-rounded-corners + kde-rounded-corners kdePackages.partitionmanager pkgs.catppuccin-cursors.mochaPeach diff --git a/home/kde/default.nix b/home/kde/default.nix index 17814d4..e383cf5 100644 --- a/home/kde/default.nix +++ b/home/kde/default.nix @@ -23,11 +23,11 @@ }; }; - # aerothemeplasma = { - # enable = true; - # plasma.enable = true; - # fonts.enable = true; - # }; + aerothemeplasma = { + enable = true; + plasma.enable = true; + fonts.enable = true; + }; programs.plasma = lib.mkDefault { enable = true; diff --git a/system/default.nix b/system/default.nix index 5b7bcf4..43618ed 100755 --- a/system/default.nix +++ b/system/default.nix @@ -143,6 +143,111 @@ LC_TIME = "en_US.UTF-8"; }; +<<<<<<< HEAD + # Enable OpenGL + hardware.graphics = { + enable = true; + }; + + programs.niri = { + enable = true; + package = pkgs.niri-unstable; + }; + services.gnome.gnome-keyring.enable = true; + security.pam.services.niri.enableGnomeKeyring = true; + programs.dconf.enable = true; + + programs.dconf.profiles.user = { + databases = [ + { + # breaks user-level indirect config of dconf + # lockAll = true; + settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + clock-format = "12h"; + clock-show-weekday = true; + }; + "org/gnome/desktop/wm/preferences" = { + button-layout = ":"; + action-double-click-titlebar = "'none'"; + }; + "org/gnome/desktop/media-handling" = { + automount = false; + automount-open = false; + autorun-never = true; + }; + "org/gnome/settings-daemon/plugins/power" = { + sleep-inactive-ac-type = "nothing"; + }; + "org/gnome/mutter" = { + edge-tiling = true; + dynamic-workspaces = true; + experimental-features = [ "variable-refresh-rate" ]; + }; + }; + } + ]; + }; + + aerothemeplasma = { + enable = true; + plasma.enable = true; + fonts.enable = false; + plymouth.enable = false; + sddm.enable = true; + }; + + services = { + # displayManager = { + # gdm.enable = true; + # defaultSession = "niri"; + # }; + desktopManager.plasma6.enable = true; + displayManager = { + sddm.enable = true; + defaultSession = "aerothemeplasma"; + }; + + libinput.enable = true; + printing.enable = true; + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + udisks2.enable = true; + gvfs.enable = true; + + upower.enable = true; + power-profiles-daemon.enable = true; + }; + + environment = { + systemPackages = with pkgs; [ + git + firefoxpwa + distrobox + ]; + }; + + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + pinentryPackage = pkgs.pinentry-curses; + }; + networking.firewall.enable = false; + + documentation.man = { + enable = true; + generateCaches = false; + }; + + services.openssh.enable = true; + +======= +>>>>>>> cd53682 (update system/default.nix) # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave