aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock150
-rw-r--r--flake.nix4
-rw-r--r--machines/common/base.nix3
-rw-r--r--machines/hierophant/configuration.nix2
-rw-r--r--users/kassouni/gpg.nix9
-rw-r--r--users/kassouni/home.nix14
6 files changed, 148 insertions, 34 deletions
diff --git a/flake.lock b/flake.lock
index 14ac1f9..4745676 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,24 @@
{
"nodes": {
+ "battlenet-umu": {
+ "inputs": {
+ "instawow": "instawow",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1793809818,
+ "narHash": "sha256-MMzDlxAX9LvDkytamrrhr0qYgCyhAWbJcIBWafbUPIE=",
+ "owner": "jacobjdowning",
+ "repo": "battlenet-umu",
+ "rev": "c4aab38d78aca0aa0b08610c4c876ffb2b971d9d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "jacobjdowning",
+ "repo": "battlenet-umu",
+ "type": "github"
+ }
+ },
"flake-compat": {
"flake": false,
"locked": {
@@ -37,6 +56,24 @@
"type": "github"
}
},
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1791914995,
+ "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@@ -89,11 +126,11 @@
]
},
"locked": {
- "lastModified": 1790996401,
- "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
+ "lastModified": 1792818383,
+ "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
+ "rev": "24f2190587513b9c2f73db112a17844ae912d965",
"type": "github"
},
"original": {
@@ -103,6 +140,29 @@
"type": "github"
}
},
+ "instawow": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": [
+ "battlenet-umu",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1792768190,
+ "narHash": "sha256-NJDx1eUj+0Vq61lmR0y8R+H6sV8ajUFIpBrWzw2vATA=",
+ "owner": "layday",
+ "repo": "instawow",
+ "rev": "e4e964d3e188d5dfeb3a4d1cbd261130a28499db",
+ "type": "github"
+ },
+ "original": {
+ "owner": "layday",
+ "ref": "v7.3.0",
+ "repo": "instawow",
+ "type": "github"
+ }
+ },
"nixos-hardware": {
"inputs": {
"nixpkgs": [
@@ -110,11 +170,11 @@
]
},
"locked": {
- "lastModified": 1791128201,
- "narHash": "sha256-rlsYY/Dg/LhbIj51Aa6TLvRpZeb3KZgUTd7llQ5XcJE=",
+ "lastModified": 1794051415,
+ "narHash": "sha256-mJok3uMK0awq2MPKdSnvTxm3UD89KD3LclQzASgtY1s=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "31cc5f4d9b9ba601071e8b8504601b9b176e2756",
+ "rev": "1a8ff4f57ffe1f732beaa1db842247a381ea471d",
"type": "github"
},
"original": {
@@ -125,27 +185,27 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1791031588,
- "narHash": "sha256-/FGDr01siZ8txrVzkOz6CYjiz0XR27JuVJP+aWchi4s=",
- "owner": "nixos",
+ "lastModified": 1793540411,
+ "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "825e2028c29b702a4a5f085f08095d12099784f2",
+ "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixos-26.05",
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1791048980,
- "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=",
+ "lastModified": 1793876309,
+ "narHash": "sha256-Wojg9lIH/hDH91iDVH2/EPw8oDSpxjxhXONbU1yf4Zg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed",
+ "rev": "f9a75f41be3a74eab55d3a7679d34ad6cc0da977",
"type": "github"
},
"original": {
@@ -157,6 +217,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1793865203,
+ "narHash": "sha256-/cpdPHaySDIyCgZI6EWngiM6jK3YLUNzv1b7lTzy6Bk=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "c56a87d8e41ce69bd2af57eb35dcc117a9dfca33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-26.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1789749394,
"narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
"owner": "NixOS",
@@ -171,13 +247,13 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
- "lastModified": 1790578696,
- "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=",
+ "lastModified": 1793540411,
+ "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
+ "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
"type": "github"
},
"original": {
@@ -190,8 +266,8 @@
"nixvim": {
"inputs": {
"flake-parts": "flake-parts",
- "nixpkgs": "nixpkgs_2",
- "systems": "systems"
+ "nixpkgs": "nixpkgs_3",
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1789959143,
@@ -210,9 +286,10 @@
},
"root": {
"inputs": {
+ "battlenet-umu": "battlenet-umu",
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim",
"sidra": "sidra",
@@ -221,14 +298,14 @@
},
"sidra": {
"inputs": {
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1791104287,
- "narHash": "sha256-rTICOIpGoV+QRyzWJNFZACpVHOLyL77gcCL64erjvOg=",
+ "lastModified": 1794097671,
+ "narHash": "sha256-0nMbMJI6A7djl0+Iin8OD1WnTNsxW+RDOh/vhyVFCxo=",
"owner": "wimpysworld",
"repo": "sidra",
- "rev": "d752e7c5f602c84bc25006c358bd7df93b2a7d5f",
+ "rev": "c7b1504c8cd876175e28ef0805066d5560f770d3",
"type": "github"
},
"original": {
@@ -248,11 +325,11 @@
]
},
"locked": {
- "lastModified": 1784166278,
- "narHash": "sha256-TSvk8AK8ACGTSeC2v/tyWX3UiiaEQ5O4nX5jqVtEEEI=",
+ "lastModified": 1793208075,
+ "narHash": "sha256-SFN2NQqoJjdsOVeJIPjjot9ltaGHpTSzfQUFaEz36LQ=",
"owner": "lytedev",
"repo": "slippi-nix",
- "rev": "d87fef3580e6afc19bc3fffbba61069df2452cbf",
+ "rev": "4ea6cababbf21dcd6d83fba5fedc686003b46589",
"type": "github"
},
"original": {
@@ -275,6 +352,21 @@
"repo": "default",
"type": "github"
}
+ },
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index bc2d1a7..c4ead80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
nixvim.url = "github:nix-community/nixvim/nixos-26.05";
sidra.url = "github:wimpysworld/sidra";
slippi.url = "github:lytedev/slippi-nix";
+ battlenet-umu.url = "github:jacobjdowning/battlenet-umu";
slippi.inputs.nixpkgs.follows = "nixpkgs";
slippi.inputs.home-manager.follows = "home-manager";
nixos-hardware = {
@@ -25,6 +26,7 @@
home-manager,
nixvim,
nixos-hardware,
+ battlenet-umu,
sidra,
slippi,
...
@@ -68,6 +70,7 @@
./users/kassouni/home.nix
nixvim.homeModules.nixvim
slippi.homeManagerModules.default
+ battlenet-umu.homeModules.default
];
home.packages = [ sidra.packages.${pkgs.system}.default ];
};
@@ -102,6 +105,7 @@
./users/kassouni/home.nix
nixvim.homeModules.nixvim
slippi.homeManagerModules.default
+ battlenet-umu.homeModules.default
];
home.packages = [ sidra.packages.${pkgs.system}.default ];
};
diff --git a/machines/common/base.nix b/machines/common/base.nix
index 53d6060..d1af2d1 100644
--- a/machines/common/base.nix
+++ b/machines/common/base.nix
@@ -1,10 +1,9 @@
-{...}: {
+{pkgs, ...}: {
virtualisation.docker = {
enable = true;
};
security.polkit.enable = true;
- services.gnome.gnome-keyring.enable = true;
services.udisks2.enable = true;
diff --git a/machines/hierophant/configuration.nix b/machines/hierophant/configuration.nix
index 6360204..6f1e302 100644
--- a/machines/hierophant/configuration.nix
+++ b/machines/hierophant/configuration.nix
@@ -33,7 +33,7 @@
in
{
device = "/dev/disk/by-label/Bertha";
- fsType = "exfat";
+ fsType = "ntfs";
noCheck = true;
options = [
"nofail"
diff --git a/users/kassouni/gpg.nix b/users/kassouni/gpg.nix
new file mode 100644
index 0000000..1baa0f3
--- /dev/null
+++ b/users/kassouni/gpg.nix
@@ -0,0 +1,9 @@
+{pkgs, ...}:
+{
+ programs.gpg.enable = true;
+
+ services.gpg-agent = {
+ enable = true;
+ pinentryPackage = pkgs.pinentry-tty;
+ };
+}
diff --git a/users/kassouni/home.nix b/users/kassouni/home.nix
index 8b84208..1eaa444 100644
--- a/users/kassouni/home.nix
+++ b/users/kassouni/home.nix
@@ -10,6 +10,7 @@
./claude.nix
./music.nix
./fonts.nix
+ ./gpg.nix
./newsboat.nix
./slippi.nix
./games.nix
@@ -33,10 +34,16 @@
"NIXOS_OZONE_WL" = "1";
};
+ programs.battlenet-umu = {
+ enable = true;
+ games = [
+ { name = "Battle.net"; }
+ ];
+ };
+
home.packages = with pkgs; [
dolphin-emu
cmus
- vscode
discord
btop
wget
@@ -58,9 +65,12 @@
enable = true;
enableBashIntegration = true;
};
-
+
+ # enable drive auto mounting
services.udiskie.enable = true;
+ services.gnome-keyring.enable = true;
+
services.picom = {
enable = true;
# modesetting has no TearFree option, so the compositor has to do the
generated by cgit v1.3.1 (git 2.54.0) at 2026-11-12 14:40:25 +0000