summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock120
-rw-r--r--modules/nixosModules/createHost.nix2
-rw-r--r--modules/nixosModules/desktop/default.nix5
-rw-r--r--modules/nixosModules/desktop/gaming.nix2
-rw-r--r--modules/packages/noctalia/hosts/tiamat/noctalia.json3
-rw-r--r--modules/packages/noctalia/hosts/tiamat/noctalia.nix6
-rw-r--r--modules/packages/noctalia/hosts/vecna/noctalia.json3
-rw-r--r--modules/packages/noctalia/hosts/vecna/noctalia.nix6
-rw-r--r--modules/packages/noctalia/noctalia.json3
-rw-r--r--modules/packages/noctalia/noctalia.nix6
10 files changed, 99 insertions, 57 deletions
diff --git a/flake.lock b/flake.lock
index 0b4b8cd..5bb331b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1751685974,
- "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+ "lastModified": 1777699697,
+ "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
"ref": "refs/heads/main",
- "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
- "revCount": 92,
+ "rev": "382052b74656a369c5408822af3f2501e9b1af81",
+ "revCount": 94,
"type": "git",
"url": "https://git.lix.systems/lix-project/flake-compat.git"
},
@@ -42,11 +42,11 @@
]
},
"locked": {
- "lastModified": 1769996383,
- "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+ "lastModified": 1778716662,
+ "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+ "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github"
},
"original": {
@@ -63,11 +63,11 @@
]
},
"locked": {
- "lastModified": 1778805320,
- "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
+ "lastModified": 1780099287,
+ "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
+ "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d",
"type": "github"
},
"original": {
@@ -93,11 +93,11 @@
},
"mnw": {
"locked": {
- "lastModified": 1777828893,
- "narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
+ "lastModified": 1778541201,
+ "narHash": "sha256-n0twkzWexzjsoDycOTvvQNuGEdg62UiNHYcFCduYpKI=",
"owner": "Gerg-L",
"repo": "mnw",
- "rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
+ "rev": "1a3573fc9d2486738fe0b2cacc5cd10dd5f3a445",
"type": "github"
},
"original": {
@@ -114,27 +114,27 @@
]
},
"locked": {
- "lastModified": 1776882296,
- "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
+ "lastModified": 1779233504,
+ "narHash": "sha256-YIKEyzh0NFQlD0O92LQQNMoVCDwV8yw1Xz0Iu+4ZC5U=",
"owner": "feel-co",
"repo": "ndg",
- "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
+ "rev": "86f6644411a64d5413711895b7cf6e0e1be465b6",
"type": "github"
},
"original": {
"owner": "feel-co",
- "ref": "refs/tags/v2.6.0",
+ "ref": "refs/tags/v2.8.0",
"repo": "ndg",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
- "lastModified": 1777402031,
- "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
+ "lastModified": 1779998907,
+ "narHash": "sha256-8CSkdFNkAF49pmhFneEFNAO4UX9/0FnoMwXMY3yyvi0=",
"owner": "gmodena",
"repo": "nix-flatpak",
- "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
+ "rev": "744221c2aef17f1f2a13278abfeabd9bd5e40180",
"type": "github"
},
"original": {
@@ -144,12 +144,15 @@
}
},
"nixos-hardware": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ },
"locked": {
- "lastModified": 1779099457,
- "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
+ "lastModified": 1780310866,
+ "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
+ "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
"type": "github"
},
"original": {
@@ -161,18 +164,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1778869304,
- "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
- "type": "github"
+ "lastModified": 1767892417,
+ "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+ "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+ "type": "tarball",
+ "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
+ "type": "tarball",
+ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
}
},
"nixpkgs-lib": {
@@ -192,22 +192,38 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1778869304,
- "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+ "lastModified": 1780243769,
+ "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+ "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
+ "lastModified": 1779536132,
+ "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "locked": {
"lastModified": 1773734432,
"narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
"owner": "NixOS",
@@ -234,11 +250,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1779018518,
- "narHash": "sha256-RUmjcuxbaa8UKsd5rUO5bqDe9YxGBDLXd4tFFBi351E=",
+ "lastModified": 1780042000,
+ "narHash": "sha256-RxFOqPMAlbWiWwh7CQ0bIHIdt4D5gAttx3YVifBBWgE=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "cd45295f9c65ca81f323155660ba83d427bd0154",
+ "rev": "07b57ebc6c9e778c536ac0ff1b01fb18dc90239a",
"type": "github"
},
"original": {
@@ -253,7 +269,7 @@
"import-tree": "import-tree",
"nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_2",
"nvf": "nvf",
"wrapper-modules": "wrapper-modules",
"wrappers": "wrappers",
@@ -277,14 +293,14 @@
},
"wrapper-modules": {
"inputs": {
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1779097596,
- "narHash": "sha256-gccfNjqb+2CZ3cpVfjX5fuh7jlLDqCk3QdPGbHWw1+o=",
+ "lastModified": 1779886850,
+ "narHash": "sha256-Udj+9DzeLccvPKoW9Q8xFdqIhrw2jhYMoqxBv+8iWzo=",
"owner": "BirdeeHub",
"repo": "nix-wrapper-modules",
- "rev": "35c1b3a813ed0ae6d838dc5aad1d60598e1f0e39",
+ "rev": "168fd6f514a9f8fa47df4fdcf9ecd61db10aec68",
"type": "github"
},
"original": {
@@ -295,14 +311,14 @@
},
"wrappers": {
"inputs": {
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1779104884,
- "narHash": "sha256-Yc0JCy/iEpQud5kuQZ3aTU47CLoaM+QFMv3qkvmHncs=",
+ "lastModified": 1779447529,
+ "narHash": "sha256-iLPDE+Y94InNZvt92On6gWWvFOavfOzkKyEwraHUzGc=",
"owner": "Lassulus",
"repo": "wrappers",
- "rev": "1f4747f30857053e9cecad4b496c0e67029509ec",
+ "rev": "c27eb498c21c45ec33fce35a8572ddf96f072d48",
"type": "github"
},
"original": {
@@ -319,11 +335,11 @@
]
},
"locked": {
- "lastModified": 1779093899,
- "narHash": "sha256-wzHbwUimm45J5r+d4VOi2rrRWwvYimP6OM8BJBIHbYc=",
+ "lastModified": 1780372976,
+ "narHash": "sha256-7B90rWlpRZ6bZtRDCKZOqqfAjFFhiTDHXymWw2omhJ4=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
- "rev": "d21282d88c6bd4b3dc692566c5d84de39f7a96c0",
+ "rev": "decef750607ebed4f8ccd9cd6169907367ab08b1",
"type": "github"
},
"original": {
diff --git a/modules/nixosModules/createHost.nix b/modules/nixosModules/createHost.nix
index 18fc915..cb5c1f4 100644
--- a/modules/nixosModules/createHost.nix
+++ b/modules/nixosModules/createHost.nix
@@ -41,7 +41,7 @@
networking.networkmanager.enable = true;
- time.timeZone = lib.mkDefault "US/Central";
+ time.timeZone = lib.mkDefault "US/Eastern";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
diff --git a/modules/nixosModules/desktop/default.nix b/modules/nixosModules/desktop/default.nix
index 69050f4..4ab9e13 100644
--- a/modules/nixosModules/desktop/default.nix
+++ b/modules/nixosModules/desktop/default.nix
@@ -35,6 +35,7 @@
######
pkgs.qbittorrent
pkgs.thunderbird
+ pkgs.twinejs
pkgs.ungoogled-chromium
pkgs.vlc
pkgs.winetricks
@@ -74,5 +75,9 @@
"x-scheme-handler/unknown" = "zen-beta.desktop";
};
};
+
+ nixpkgs.config.permittedInsecurePackages = [
+ "electron-39.8.10"
+ ];
};
}
diff --git a/modules/nixosModules/desktop/gaming.nix b/modules/nixosModules/desktop/gaming.nix
index c0ae404..98e4189 100644
--- a/modules/nixosModules/desktop/gaming.nix
+++ b/modules/nixosModules/desktop/gaming.nix
@@ -25,13 +25,13 @@
};
environment.systemPackages = with pkgs; [
- faugus-launcher
prismlauncher
heroic
];
services.flatpak = {
enable = lib.mkDefault true;
+ update.onActivation = lib.mkDefault true;
packages = [
"org.vinegarhq.Sober"
];
diff --git a/modules/packages/noctalia/hosts/tiamat/noctalia.json b/modules/packages/noctalia/hosts/tiamat/noctalia.json
index 7c344fb..d57c32e 100644
--- a/modules/packages/noctalia/hosts/tiamat/noctalia.json
+++ b/modules/packages/noctalia/hosts/tiamat/noctalia.json
@@ -620,7 +620,8 @@
"visualizerType": "linear",
"spectrumMirrored": true,
"mprisBlacklist": [
- "zen-twilight"
+ "brave",
+ "Mozilla zen"
],
"preferredPlayer": "feishin",
"volumeFeedback": false,
diff --git a/modules/packages/noctalia/hosts/tiamat/noctalia.nix b/modules/packages/noctalia/hosts/tiamat/noctalia.nix
index 212ac47..7f8a7ab 100644
--- a/modules/packages/noctalia/hosts/tiamat/noctalia.nix
+++ b/modules/packages/noctalia/hosts/tiamat/noctalia.nix
@@ -3,6 +3,12 @@
packages.tiamat-noctalia-shell = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
inherit pkgs;
settings = (builtins.fromJSON (builtins.readFile ./noctalia.json)).settings;
+ runtimePkgs = [pkgs.papirus-icon-theme];
+ env = {
+ QS_ICON_THEME = "Papirus-Dark";
+ GTK_ICON_THEME = "Papirus-Dark";
+ XDG_DATA_DIRS = "\${XDG_DATA_DIRS:-}:/run/current-system/sw/share:~/.local/share:~/.nix-profile/share:${pkgs.papirus-icon-theme}/share";
+ };
};
};
}
diff --git a/modules/packages/noctalia/hosts/vecna/noctalia.json b/modules/packages/noctalia/hosts/vecna/noctalia.json
index b9c0b54..0c571a6 100644
--- a/modules/packages/noctalia/hosts/vecna/noctalia.json
+++ b/modules/packages/noctalia/hosts/vecna/noctalia.json
@@ -618,7 +618,8 @@
"visualizerType": "linear",
"spectrumMirrored": true,
"mprisBlacklist": [
- "zen-twilight"
+ "brave",
+ "Mozilla zen"
],
"preferredPlayer": "feishin",
"volumeFeedback": false,
diff --git a/modules/packages/noctalia/hosts/vecna/noctalia.nix b/modules/packages/noctalia/hosts/vecna/noctalia.nix
index 1aca3a9..661f341 100644
--- a/modules/packages/noctalia/hosts/vecna/noctalia.nix
+++ b/modules/packages/noctalia/hosts/vecna/noctalia.nix
@@ -3,6 +3,12 @@
packages.vecna-noctalia-shell = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
inherit pkgs;
settings = (builtins.fromJSON (builtins.readFile ./noctalia.json)).settings;
+ runtimePkgs = [pkgs.papirus-icon-theme];
+ env = {
+ QS_ICON_THEME = "Papirus-Dark";
+ GTK_ICON_THEME = "Papirus-Dark";
+ XDG_DATA_DIRS = "\${XDG_DATA_DIRS:-}:/run/current-system/sw/share:~/.local/share:~/.nix-profile/share:${pkgs.papirus-icon-theme}/share";
+ };
};
};
}
diff --git a/modules/packages/noctalia/noctalia.json b/modules/packages/noctalia/noctalia.json
index 5766fcd..90ed839 100644
--- a/modules/packages/noctalia/noctalia.json
+++ b/modules/packages/noctalia/noctalia.json
@@ -610,7 +610,8 @@
"visualizerType": "linear",
"spectrumMirrored": true,
"mprisBlacklist": [
- "zen-twilight"
+ "brave",
+ "Mozilla zen"
],
"preferredPlayer": "feishin",
"volumeFeedback": false,
diff --git a/modules/packages/noctalia/noctalia.nix b/modules/packages/noctalia/noctalia.nix
index 7272ac3..1de6f45 100644
--- a/modules/packages/noctalia/noctalia.nix
+++ b/modules/packages/noctalia/noctalia.nix
@@ -3,6 +3,12 @@
packages.noctalia-shell = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
inherit pkgs;
settings = (builtins.fromJSON (builtins.readFile ./noctalia.json)).settings;
+ runtimePkgs = [pkgs.papirus-icon-theme];
+ env = {
+ QS_ICON_THEME = "Papirus-Dark";
+ GTK_ICON_THEME = "Papirus-Dark";
+ XDG_DATA_DIRS = "\${XDG_DATA_DIRS:-}:/run/current-system/sw/share:~/.local/share:~/.nix-profile/share:${pkgs.papirus-icon-theme}/share";
+ };
};
};
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-18 07:56:27 +0000