oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-06-15 22:41:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
Jor Oqyude
2025-08-04 22:16:21 +03:00
parent 56e97b6d5f
commit 7f450271ab
13 changed files with 365 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
-16
View File
@@ -358,7 +358,6 @@
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"zapret": "zapret", "zapret": "zapret",
"zeroq": "zeroq",
"zeroq-credentials": "zeroq-credentials" "zeroq-credentials": "zeroq-credentials"
} }
}, },
@@ -412,21 +411,6 @@
"type": "github" "type": "github"
} }
}, },
"zeroq": {
"locked": {
"lastModified": 1754248619,
"narHash": "sha256-/6BUL/pJnrQZd2S+a+UbF1ByiR5xQfdQTokUGZUyJGU=",
"ref": "refs/heads/master",
"rev": "44ba9d7980c87f8e90b7351f73dfe3483b0226b9",
"revCount": 2,
"type": "git",
"url": "ssh://git@github.com/oqyude/zeroq.git"
},
"original": {
"type": "git",
"url": "ssh://git@github.com/oqyude/zeroq.git"
}
},
"zeroq-credentials": { "zeroq-credentials": {
"locked": { "locked": {
"lastModified": 1753537856, "lastModified": 1753537856,
flake.nix
+1 -1
View File
@@ -4,7 +4,7 @@
inputs = { inputs = {
# My # My
zeroq.url = "git+ssh://git@github.com/oqyude/zeroq.git"; # flake of variables #zeroq.url = "git+ssh://git@github.com/oqyude/zeroq.git"; # flake of variables
zeroq-credentials.url = "git+ssh://git@github.com/oqyude/zeroq-credentials.git"; # flake of creds zeroq-credentials.url = "git+ssh://git@github.com/oqyude/zeroq-credentials.git"; # flake of creds
zapret.url = "github:oqyude/zapret-easyflake"; # stupid flake of zapret zapret.url = "github:oqyude/zapret-easyflake"; # stupid flake of zapret
home/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@ let
}: }:
{ {
imports = [ imports = [
(./type + "/${xlib.device.type}.nix") (./. + "/${xlib.device.type}.nix")
#inputs.self.homeModules."${xlib.device.type}" # -> (./type + "/${xlib.device.type}.nix") #inputs.self.homeModules."${xlib.device.type}" # -> (./type + "/${xlib.device.type}.nix")
]; ];
home = { home = {
@@ -30,7 +30,7 @@ let
}: }:
{ {
imports = [ imports = [
(./type + "/${xlib.device.type}.nix") (./. + "/${xlib.device.type}.nix")
#inputs.self.homeModules."${xlib.device.type}" #inputs.self.homeModules."${xlib.device.type}"
]; ];
home = { home = {
home/type/minimal.nix → home/minimal.nix
-1
View File
@@ -1,4 +1,3 @@
{ inputs, ... }@flakeContext:
{ {
config, config,
pkgs, pkgs,
home/main.nix → home/old/main.nix
View File
home/root.nix → home/old/root.nix
View File
home/old/server.nix
Executable
+78
View File
@@ -0,0 +1,78 @@
{ inputs, ... }@flakeContext:
let
homeModule =
{
config,
lib,
pkgs,
...
}:
let
# Paths
beetsPath = "${config.xlib.dirs.storage}/beets/linux";
sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music";
in
{
imports = [
./minimal.nix
];
xdg = {
configFile = {
"beets" = {
source = config.lib.file.mkOutOfStoreSymlink beetsPath;
target = "beets";
};
};
enable = true;
autostart.enable = true;
userDirs = {
enable = true;
createDirectories = false;
desktop = null;
documents = null;
download = null;
music = null;
pictures = null;
publicShare = null;
templates = null;
videos = null;
};
};
home = {
file = {
".ssh" = {
source = config.lib.file.mkOutOfStoreSymlink sshPath;
target = ".ssh";
};
"Music" = {
source = config.lib.file.mkOutOfStoreSymlink musicPath;
target = "${config.home.homeDirectory}/Music";
};
};
username = "${config.xlib.devices.admin}";
};
};
nixosModule =
{ ... }:
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.${config.xlib.devices.admin} = homeModule;
sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
};
};
in
(
(inputs.home-manager.lib.homeManagerConfiguration {
modules = [
homeModule
];
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
})
// {
inherit nixosModule;
}
)
home/old/wsl.nix
Executable
+91
View File
@@ -0,0 +1,91 @@
{ inputs, ... }@flakeContext:
let
homeModule =
{
config,
lib,
pkgs,
...
}:
let
# Paths
beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${config.xlib.dirs.wsl-home}";
in
{
imports = [
inputs.self.homeModules.default
];
xdg = {
enable = true;
autostart.enable = true;
configFile = {
"beets" = {
source = config.lib.file.mkOutOfStoreSymlink beetsPath;
target = "beets";
};
};
# userDirs = {
# enable = false;
# createDirectories = false;
# desktop = null;
# documents = null;
# download = null;
# music = null;
# pictures = null;
# publicShare = null;
# templates = null;
# videos = null;
# };
};
home = {
#username = "${config.xlib.devices.admin}";
file = {
"External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath;
target = "External";
};
"Music" = {
source = config.lib.file.mkOutOfStoreSymlink musicPath;
target = "${config.home.homeDirectory}/Music";
};
};
# pointerCursor = {
# enable = true;
# x11.enable = true;
# gtk.enable = true;
# size = 24;
# name = "Qogir";
# package = pkgs.qogir-icon-theme;
# };
};
};
nixosModule =
{ config, ... }:
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.${config.xlib.devices.admin} = homeModule;
# sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
# extraSpecialArgs = {
# inherit (config.networking) hostName;
# };
};
};
in
(
(inputs.home-manager.lib.homeManagerConfiguration {
modules = [
homeModule
];
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
})
// {
inherit nixosModule;
}
)
home/primary.nix
+83
View File
@@ -0,0 +1,83 @@
{
config,
lib,
pkgs,
xlib,
...
}:
{
imports = [ ] ++ (builtins.attrValues inputs.self.homeModules);
xdg = {
enable = true;
autostart.enable = true;
configFile = {
"beets" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/beets/linux";
target = "beets";
};
"ludusavi" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/ludusavi/cfg";
target = "ludusavi";
};
"solaar" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/solaar";
target = "solaar";
};
"easyeffects" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/easyeffects";
target = "easyeffects";
};
"keepassxc" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/KeePassXC";
target = "keepassxc";
};
};
dataFile = {
"PrismLauncher" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/Games/PrismLauncher";
target = "PrismLauncher";
};
"v2rayN" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/v2rayN";
target = "v2rayN";
};
};
userDirs = {
enable = true;
createDirectories = true;
desktop = "${config.xdg.dataHome}/desktop";
documents = null;
download = "${config.home.homeDirectory}/Downloads";
music = "${config.home.homeDirectory}/Music";
pictures = "${config.home.homeDirectory}/Pictures";
publicShare = "${config.home.homeDirectory}/Misc/Public";
templates = null;
videos = "${config.home.homeDirectory}/Pictures/Videos";
};
};
home = {
file = {
"ssh" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.user-storage}/ssh/${config.home.username}";
target = ".ssh";
};
"External" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.therima-drive}";
target = "External";
};
"LM Studio" = {
source = config.lib.file.mkOutOfStoreSymlink "${xlib.dirs.vetymae-drive}/AI/LM Studio";
target = ".lmstudio";
};
};
pointerCursor = {
enable = true;
x11.enable = true;
gtk.enable = true;
size = 24;
name = "Qogir";
package = pkgs.qogir-icon-theme;
};
};
}
home/server.nix
Executable → Regular
+4 -30
View File
@@ -1,21 +1,19 @@
{ inputs, ... }@flakeContext:
let
homeModule =
{ {
config, config,
lib, lib,
pkgs, pkgs,
xlib,
... ...
}: }:
let let
# Paths # Paths
beetsPath = "${config.xlib.dirs.storage}/beets/linux"; beetsPath = "${xlib.dirs.storage}/beets/linux";
sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}"; sshPath = "${xlib.dirs.storage}/ssh/${xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
in in
{ {
imports = [ imports = [
inputs.self.homeModules.default ./minimal.nix
]; ];
xdg = { xdg = {
configFile = { configFile = {
@@ -50,29 +48,5 @@ let
target = "${config.home.homeDirectory}/Music"; target = "${config.home.homeDirectory}/Music";
}; };
}; };
username = "${config.xlib.devices.admin}";
}; };
};
nixosModule =
{ ... }:
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.${config.xlib.devices.admin} = homeModule;
sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
};
};
in
(
(inputs.home-manager.lib.homeManagerConfiguration {
modules = [
homeModule
];
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
})
// {
inherit nixosModule;
} }
)
home/type/wsl.nix
-59
View File
@@ -1,59 +0,0 @@
{
config,
pkgs,
...
}:
let
# Paths
beetsPath = "${xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${xlib.dirs.wsl-home}";
in
{
imports = [
./minimal.nix
];
xdg = {
enable = true;
autostart.enable = true;
configFile = {
"beets" = {
source = config.lib.file.mkOutOfStoreSymlink beetsPath;
target = "beets";
};
};
# userDirs = {
# enable = false;
# createDirectories = false;
# desktop = null;
# documents = null;
# download = null;
# music = null;
# pictures = null;
# publicShare = null;
# templates = null;
# videos = null;
# };
};
home = {
file = {
"External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath;
target = "External";
};
"Music" = {
source = config.lib.file.mkOutOfStoreSymlink musicPath;
target = "${config.home.homeDirectory}/Music";
};
};
# pointerCursor = {
# enable = true;
# x11.enable = true;
# gtk.enable = true;
# size = 24;
# name = "Qogir";
# package = pkgs.qogir-icon-theme;
# };
};
}
home/wsl.nix
Executable → Regular
+5 -36
View File
@@ -1,22 +1,19 @@
{ inputs, ... }@flakeContext:
let
homeModule =
{ {
config, config,
lib,
pkgs, pkgs,
xlib,
... ...
}: }:
let let
# Paths # Paths
beetsPath = "${config.xlib.dirs.wsl-storage}/beets/linux"; beetsPath = "${xlib.dirs.wsl-storage}/beets/linux";
#sshPath = "${config.xlib.dirs.storage}/ssh/${config.xlib.devices.server.hostname}"; #sshPath = "${xlib.dirs.wsl-storage}/ssh/${config.xlib.devices.server.hostname}";
musicPath = "${config.home.homeDirectory}/External/Music"; musicPath = "${config.home.homeDirectory}/External/Music";
externalPath = "${config.xlib.dirs.wsl-home}"; externalPath = "${xlib.dirs.wsl-home}";
in in
{ {
imports = [ imports = [
inputs.self.homeModules.default ./minimal.nix
]; ];
xdg = { xdg = {
enable = true; enable = true;
@@ -40,9 +37,7 @@ let
# videos = null; # videos = null;
# }; # };
}; };
home = { home = {
#username = "${config.xlib.devices.admin}";
file = { file = {
"External" = { "External" = {
source = config.lib.file.mkOutOfStoreSymlink externalPath; source = config.lib.file.mkOutOfStoreSymlink externalPath;
@@ -62,30 +57,4 @@ let
# package = pkgs.qogir-icon-theme; # package = pkgs.qogir-icon-theme;
# }; # };
}; };
};
nixosModule =
{ config, ... }:
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.${config.xlib.devices.admin} = homeModule;
# sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
# extraSpecialArgs = {
# inherit (config.networking) hostName;
# };
};
};
in
(
(inputs.home-manager.lib.homeManagerConfiguration {
modules = [
homeModule
];
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
})
// {
inherit nixosModule;
} }
)
modules/software/beets/default.nix
+2 -2
View File
@@ -20,12 +20,12 @@ let
in in
{ {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"z /mnt/beets 0700 ${config.xlib.devices.admin} users -" # beets absolute paths "z /mnt/beets 0700 ${config.xlib.device.username} users -" # beets absolute paths
]; ];
users = { users = {
users = { users = {
"${config.xlib.devices.admin}" = { "${config.xlib.device.username}" = {
packages = [ packages = [
beetsEnv beetsEnv
pkgs.mp3gain pkgs.mp3gain