diff --git a/configs/pantheon.nix b/configs/pantheon.nix new file mode 100644 index 0000000..639e2ff --- /dev/null +++ b/configs/pantheon.nix @@ -0,0 +1,76 @@ +{ + config, + pkgs, + lib, + ... +}: { + programs = { + # pantheon-tweaks.enable = true; + evolution.enable = true; + }; + + services = { + xserver = { + enable = true; + excludePackages = [pkgs.xterm]; + + xkb.layout = "us"; + + updateDbusEnvironment = true; + + displayManager = { + lightdm = { + enable = true; + greeters.pantheon.enable = true; + }; + }; + + desktopManager.pantheon = { + enable = true; + extraWingpanelIndicators = with pkgs; [ + monitor + wingpanel-indicator-ayatana + ]; + }; + }; + + # Enable touchpad support. + libinput.enable = true; + }; + + systemd.user.services = { + # monitor = { + # description = "indicator-monitor"; + # wantedBy = [ "graphical-session.target" ]; + # partOf = [ "graphical-session.target" ]; + # serviceConfig = { + # ExecStart = "${pkgs.monitor}/bin/com.github.stsdc.monitor"; + # }; + # }; + + indicatorapp = { + description = "indicator-application-gtk3"; + wantedBy = ["graphical-session.target"]; + partOf = ["graphical-session.target"]; + serviceConfig = { + ExecStart = "${pkgs.indicator-application-gtk3}/libexec/indicator-application/indicator-application-service"; + }; + }; + }; + + # App indicator + environment.pathsToLink = ["/libexec"]; + environment.systemPackages = with pkgs; [ + gnome-online-accounts + gnome-control-center + gnome-system-monitor + indicator-application-gtk3 + monitor + pantheon-tweaks + eog + ]; + + environment.pantheon.excludePackages = with pkgs.pantheon; [ + elementary-code + ]; +} diff --git a/configs/plasma.nix b/configs/plasma.nix index a69d467..373288f 100644 --- a/configs/plasma.nix +++ b/configs/plasma.nix @@ -5,6 +5,10 @@ lib, ... }: { + nixpkgs.config.permittedInsecurePackages = [ + "deskflow-1.18.0" + ]; + programs = { dconf.enable = true; kdeconnect.enable = true; @@ -52,7 +56,7 @@ kdiskmark maliit-keyboard - # deskflow + deskflow ]; persistence."/persist" = { @@ -69,7 +73,7 @@ enable = true; wayland.enable = true; }; - # defaultSession = "plasmax11"; + defaultSession = "plasma"; }; # xserver = { diff --git a/flake.lock b/flake.lock index cb9b65d..bc2aa35 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737216937, - "narHash": "sha256-lgIK7OsoH+KeovKlhw3aEKclK6Rb1eGHH9Mx9s0pgOg=", + "lastModified": 1737534778, + "narHash": "sha256-7h/lJWRzKKCmpKmgGk2ZzWbj73Dqi607grXC/EhFQMI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "e300abf0ef16528298be33f66a2f70b20b15d2fa", + "rev": "a650b785c5d2b064777e0c5af7a414267a8fc934", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1737009074, - "narHash": "sha256-BF+OxooVz4KeSIJyLXCnX2VTMsyfGrpEsay76hGRyrI=", + "lastModified": 1737268357, + "narHash": "sha256-J3At8JDKpQGDeDUcz1eh0h5yFwNH7fPfm+N95TxiOq4=", "owner": "nix-community", "repo": "fenix", - "rev": "fe17a42e2c306d1a8a4fb3f977b12048d8cf7471", + "rev": "f9662e6ea6020671e1e17102bd20d6692bb38aba", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1736883540, - "narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1737221749, - "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1737007397, - "narHash": "sha256-uJ7Lk0moWSn8Tr0QkUbOCWR7WrhiLeha4E00rckhl8I=", + "lastModified": 1737126697, + "narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6bbb19666e753c18ef8af35f590cbc3ba42dd0ca", + "rev": "27a0ddac1a14e10ba98530f59db728951495f2ce", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1737052390, - "narHash": "sha256-px/UOfTgr46ilEELRvx2f042u4UzcAU4JiH8+G+Rc6s=", + "lastModified": 1737357122, + "narHash": "sha256-xus6cje9ry/RJjBLqE+rSZx50CIYyBmeSXll1Bgb/3g=", "owner": "taj-ny", "repo": "kwin-effects-forceblur", - "rev": "f7bb683dde404f6df9858e2b6bb6bb7a9039751b", + "rev": "f4ef0fbf2dea2ece4e414d52e9126aa07b8a5579", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1737162735, - "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -304,11 +304,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1736970696, - "narHash": "sha256-WP5yBCVkidEf5y3kCaUSjRd0udpAE6nmY3MMx3Q2aNo=", + "lastModified": 1737215993, + "narHash": "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "7d337c7f350a163ac3a9bd4ce0c4dae2df20579b", + "rev": "248bd511aee2c1c1cb2d5314649521d6d93b854a", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1737107480, - "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "mic92", "repo": "sops-nix", - "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index 9711458..7f4a4ab 100644 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -158,7 +158,8 @@ in { graphics = { enable = true; enable32Bit = true; - extraPackages = with pkgs; [rocmPackages.clr.icd]; + # doesnt build atm + # extraPackages = with pkgs; [rocmPackages.clr.icd]; }; # cpu.x86.msr = { @@ -166,10 +167,10 @@ in { # }; }; - # powerManagement = { - # enable = true; - # powertop.enable = true; - # }; + powerManagement = { + enable = true; + powertop.enable = true; + }; services = { power-profiles-daemon.enable = true; @@ -183,11 +184,6 @@ in { pulse.enable = true; }; - sunshine = { - enable = true; - capSysAdmin = true; - }; - samba = { enable = true; settings = { @@ -216,17 +212,6 @@ in { }; }; - duplicati = { - enable = true; - user = "alex"; - }; - - # jellyfin = { - # enable = true; - # user = "alex"; - # group = "users"; - # }; - borgbackup.jobs = { home = rec { compression = "auto,zstd"; diff --git a/apply.sh b/scripts/apply.sh similarity index 100% rename from apply.sh rename to scripts/apply.sh diff --git a/btrfs-list b/scripts/btrfs-list similarity index 100% rename from btrfs-list rename to scripts/btrfs-list diff --git a/commit.sh b/scripts/commit.sh similarity index 100% rename from commit.sh rename to scripts/commit.sh diff --git a/fs-diff.sh b/scripts/fs-diff.sh similarity index 100% rename from fs-diff.sh rename to scripts/fs-diff.sh diff --git a/hostkey-to-agepub.sh b/scripts/hostkey-to-agepub.sh similarity index 100% rename from hostkey-to-agepub.sh rename to scripts/hostkey-to-agepub.sh diff --git a/trim-generations.sh b/scripts/trim-generations.sh similarity index 100% rename from trim-generations.sh rename to scripts/trim-generations.sh