macronova/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor flakes

Browse source
This commit is contained in:
Invariantspace 2024-08-20 13:31:41 -07:00
parent 2ad2440491
commit 84f7bc915f
No known key found for this signature in database
GPG key ID: EBC4A20067373921
5 changed files with 69 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/users.nix
View file

@ -54,15 +54,11 @@ in {
then
[
sweet-ambar-blue
wallpaper-engine-plasma6-plugin
yorha-sound-theme
]
++ (with kdePackages; [
qtmultimedia
qtstyleplugin-kvantum
qtwebchannel
qtwebengine
qtwebsockets
# wallpaper-engine-plugin
])
else []
);
@ -140,19 +136,13 @@ in {
appearance.wallpaperPictureOfTheDay.provider = "bing";
};
kwin = {
borderlessMaximizedWindows = true;
effects = {
blur.enable = true;
desktopSwitching.animation = "slide";
dimAdminMode.enable = true;
windowOpenClose.animation = "glide";
};
scripts.polonium = {
enable = true;
settings = {
layout.engine = "binaryTree";
tilePopups = false;
};
};
virtualDesktops = {
number = 4;
rows = 1;

54
flake.lock generated
View file

@ -37,11 +37,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1723685519,
"narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
"lastModified": 1724163524,
"narHash": "sha256-3A06DYw47oSLYMalkWDLzTMHC0MKgm1mNfaca9sqUnI=",
"owner": "nix-community",
"repo": "disko",
"rev": "276a0d055a720691912c6a34abb724e395c8e38a",
"rev": "c7b14da22e302e0f9d7aa4df26b61016bcedf738",
"type": "github"
},
"original": {
@ -141,11 +141,11 @@
},
"hardware": {
"locked": {
"lastModified": 1723310128,
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
"lastModified": 1724067415,
"narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
"rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
"type": "github"
},
"original": {
@ -159,11 +159,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1723399884,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"type": "github"
},
"original": {
@ -199,11 +199,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1723607977,
"narHash": "sha256-ueu9wxOlTYyxhmPEwlRB5uhPOdDXY4n7+rd+hiPBAzU=",
"lastModified": 1724128906,
"narHash": "sha256-junn8oz6yG1akc5R5b8LjcAl1epKJkAzwPlG57bB3E0=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "9b87c1c781af3cd837847f7042723b76f6d7472e",
"rev": "d9947d55383ece6ac396820112d34734cf47e2bb",
"type": "github"
},
"original": {
@ -285,11 +285,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1723603349,
"narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
"lastModified": 1723891200,
"narHash": "sha256-uljX21+D/DZgb9uEFFG2dkkQbPZN+ig4Z6+UCLWFVAk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
"rev": "a0d6390cb3e82062a35d0288979c45756e481f60",
"type": "github"
},
"original": {
@ -364,11 +364,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {
@ -411,11 +411,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {
@ -479,11 +479,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1723587631,
"narHash": "sha256-FZ27DsgOROvv/4Cvo34UcIqEJLQ6cKIWHcQsM3zLN3I=",
"lastModified": 1724176973,
"narHash": "sha256-k2Y26WXJQvvDf2CRXvN6KSDPWHkhisGAejJvQak+nYk=",
"owner": "pjones",
"repo": "plasma-manager",
"rev": "76dab4ba280ddd1b6c5aec0bb0aa0ace201c39ae",
"rev": "f13208d6b4cc58458168f5174f4fae463126c074",
"type": "github"
},
"original": {
@ -500,11 +500,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1723202784,
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
"lastModified": 1724159077,
"narHash": "sha256-AddE0u6WbA5R7uxumw1Ka0oG5dv3cTtN0ppO/M/e0cg=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "c7012d0c18567c889b948781bc74a501e92275d1",
"rev": "1064a45e81a4e19cda98741b71219d9f4f136900",
"type": "github"
},
"original": {

8
flake.nix
View file

@ -50,6 +50,14 @@
};
nixpkgs = {
config.allowUnfree = true;
# TODO: Remove this when possible
config.permittedInsecurePackages = [
"cinny-4.1.0"
"cinny-unwrapped-4.1.0"
"olm-3.2.16"
];
overlays = [nix-custom.overlays.default];
};
})

50
linux/blitzar/gui.nix
View file

@ -12,31 +12,26 @@ in {
}: let
xdgCfg = config.xdg;
in {
home.packages = with pkgs;
[
feishin
hunspell
hunspellDicts.en-us-large
jellyfin-mpv-shim
joplin-desktop
libreoffice-qt6-fresh
lutris
nvtopPackages.amd
picard
qbittorrent
razergenie
ryujinx
telegram-desktop
thunderbird
via
winetricks
wineWowPackages.stagingFull
]
++ (with kdePackages; [
k3b
kdepim-addons
merkuro
]);
home.packages = with pkgs; [
feishin
hunspell
hunspellDicts.en-us-large
jellyfin-mpv-shim
joplin-desktop
libreoffice-qt6-fresh
lutris
nheko
nvtopPackages.amd
picard
qbittorrent
razergenie
ryujinx
telegram-desktop
thunderbird
via
winetricks
wineWowPackages.stagingFull
];
programs = {
git.signing = {
key = "0x6A815D4CB1637AAC";
@ -135,6 +130,11 @@ in {
programs = {
dconf.enable = true;
k3b.enable = true;
kde-pim = {
enable = true;
merkuro = true;
};
partition-manager.enable = true;
steam.enable = true;
};

8
linux/singularity/caddy.nix
View file

@ -55,7 +55,13 @@
"matrix.${dn}".extraConfig = ''
reverse_proxy /_matrix/* ${homeSrv "conduit"}
file_server {
root ${pkgs.cinny}
root ${pkgs.cinny.override {
conf = {
defaultHomeserver = 0;
hashRouter.enabled = true;
homeserverList = [dn];
};
}}
}
'';
"vault.${dn}".extraConfig = ''