Compare commits

...

3 Commits

Author SHA1 Message Date
4566ce8f64 desktop-2025-02-01-10-34-06 2025-02-01 10:34:06 +01:00
b5f2018402 desktop-2025-01-29-14-20-16 2025-01-29 14:20:16 +01:00
71725a2ee5 desktop-2025-01-19-18-40-29 2025-01-19 18:40:29 +01:00
12 changed files with 180 additions and 63 deletions

76
configs/pantheon.nix Normal file
View File

@ -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
];
}

View File

@ -5,6 +5,10 @@
lib, lib,
... ...
}: { }: {
nixpkgs.config.permittedInsecurePackages = [
"deskflow-1.18.0"
];
programs = { programs = {
dconf.enable = true; dconf.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
@ -52,7 +56,7 @@
kdiskmark kdiskmark
maliit-keyboard maliit-keyboard
# deskflow deskflow
]; ];
persistence."/persist" = { persistence."/persist" = {
@ -69,7 +73,7 @@
enable = true; enable = true;
wayland.enable = true; wayland.enable = true;
}; };
# defaultSession = "plasmax11"; defaultSession = "plasma";
}; };
# xserver = { # xserver = {

View File

@ -54,7 +54,7 @@
keepassxc keepassxc
nextcloud-client nextcloud-client
pinta pinta
# rustdesk-flutter rustdesk-flutter
simple-scan simple-scan
# discord # discord

114
flake.lock generated
View File

@ -2,17 +2,18 @@
"nodes": { "nodes": {
"chaotic": { "chaotic": {
"inputs": { "inputs": {
"fenix": "fenix",
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian": "jovian", "jovian": "jovian",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1736112920, "lastModified": 1737973837,
"narHash": "sha256-MME0HoMWJtk67vW4lop1eTK4//EXJB/hefo6+JbdHZs=", "narHash": "sha256-LrM+QVWUZhPKbjm2I5EkypupivGHjr/AM4rCaNbCFfE=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "aa7b9944e164d9284939b78d05b8cf8df319a5d5", "rev": "f19af140dacd0e211a25cf907be46356347e190f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,6 +23,28 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1737268357,
"narHash": "sha256-J3At8JDKpQGDeDUcz1eh0h5yFwNH7fPfm+N95TxiOq4=",
"owner": "nix-community",
"repo": "fenix",
"rev": "f9662e6ea6020671e1e17102bd20d6692bb38aba",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -82,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736066484, "lastModified": 1737221749,
"narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", "rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736089250, "lastModified": 1738261073,
"narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "narHash": "sha256-469d7Sr5vKYEXmm5z+o+NoWFZvoTd9djv9JqDtc0AAg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "rev": "a5e196d61f6e564f7fdeeb4a92cef92e1785d3f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +141,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1734945620, "lastModified": 1737831083,
"narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735931035, "lastModified": 1737126697,
"narHash": "sha256-f3WRxasPYVKzrvAlLq+/3FRHQVfxVf5xxf0WWwnO99k=", "narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "7e530766a5fd9b7577296fedd655f3255f7495d8", "rev": "27a0ddac1a14e10ba98530f59db728951495f2ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +184,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1736087333, "lastModified": 1738064867,
"narHash": "sha256-oNz0gTJfHFysyEXPbSIjUz3KGrQD425Krrfx1S/kBdA=", "narHash": "sha256-vaBgjmBHdkoTDPEy4YnTDvUvrbEXYftTnCtCZmw4EDo=",
"owner": "taj-ny", "owner": "taj-ny",
"repo": "kwin-effects-forceblur", "repo": "kwin-effects-forceblur",
"rev": "58e6653603dcccbbc38c582ee5838c536a90807b", "rev": "d7e46df232327f3d506c69f99177f2311ea4cd75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +204,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736085891, "lastModified": 1738033138,
"narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +242,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1735388221, "lastModified": 1737751639,
"narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,32 +258,32 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735834308, "lastModified": 1737929020,
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "narHash": "sha256-UC9ARAC8mRxQozZ6eO+KofV2Dd7KShl6X8XZz/ecNHg=",
"owner": "NixOS", "owner": "PedroHLC",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65", "rev": "b200ab4d4c4bc99681909139b900f10ad70bc02b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "PedroHLC",
"ref": "nixos-unstable", "ref": "revert-376078",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1738223116,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-Igf0oHuV2W8tV2OQqDsm9Fg5ct9rLuBD9h5GPAiq/qc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "c25903f220d0b558887672cc8321dddf91e99f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -278,6 +301,23 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1737215993,
"narHash": "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "248bd511aee2c1c1cb2d5314649521d6d93b854a",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -285,11 +325,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736064798, "lastModified": 1737411508,
"narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,7 +2,7 @@
description = "Your new nix config"; description = "Your new nix config";
inputs = { inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
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

@ -158,18 +158,20 @@ in {
graphics = { graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [rocmPackages.clr.icd]; # doesnt build atm
extraPackages = with pkgs; [
clinfo
rocmPackages.clr.icd
rocmPackages.rocminfo
rocmPackages.rocm-runtime
];
}; };
# cpu.x86.msr = {
# enable = true;
# };
}; };
# powerManagement = { powerManagement = {
# enable = true; enable = true;
# powertop.enable = true; powertop.enable = true;
# }; };
services = { services = {
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
@ -183,11 +185,17 @@ in {
pulse.enable = true; pulse.enable = true;
}; };
sunshine = { ollama = {
enable = true; enable = true;
capSysAdmin = true; acceleration = "rocm";
environmentVariables = {
HCC_AMDGPU_TARGET = "gfx1100"; # used to be necessary, but doesn't seem to anymore
};
rocmOverrideGfx = "11.0.0";
}; };
open-webui.enable = true;
samba = { samba = {
enable = true; enable = true;
settings = { settings = {
@ -216,17 +224,6 @@ in {
}; };
}; };
duplicati = {
enable = true;
user = "alex";
};
# jellyfin = {
# enable = true;
# user = "alex";
# group = "users";
# };
borgbackup.jobs = { borgbackup.jobs = {
home = rec { home = rec {
compression = "auto,zstd"; compression = "auto,zstd";