forked from jan-leila/nix-config
Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fa0f7b0765 | |||
| 8cd453844a | |||
| 1c12c96efe | |||
| c01ca13fcb | |||
| dce767403a | |||
| 9ed0958463 | |||
| 4cbb3d32b2 | |||
| 719a21a95e | |||
| 04777cfb8f | |||
| be8126e2c5 |
20 changed files with 93 additions and 425 deletions
|
|
@ -8,6 +8,5 @@
|
|||
in {
|
||||
leyla = lib.mkIf users.leyla.isNormalUser (import ./leyla);
|
||||
eve = lib.mkIf users.eve.isNormalUser (import ./eve);
|
||||
ivy = lib.mkIf users.ivy.isNormalUser (import ./ivy);
|
||||
git = lib.mkIf (osConfig.services.forgejo.enable or false) (import ./git);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
{osConfig, ...}: let
|
||||
userConfig = osConfig.host.users.ivy;
|
||||
in {
|
||||
imports = [
|
||||
./packages.nix
|
||||
];
|
||||
|
||||
home = {
|
||||
username = userConfig.name;
|
||||
homeDirectory = osConfig.users.users.ivy.home;
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
stateVersion = "23.11"; # Please read the comment before changing.
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
};
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. If you don't want to manage your shell through Home
|
||||
# Manager then you have to manually source 'hm-session-vars.sh' located at
|
||||
# either
|
||||
#
|
||||
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# /etc/profiles/per-user/ivy/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
sessionVariables = {
|
||||
# EDITOR = "emacs";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
osConfig,
|
||||
...
|
||||
}: {
|
||||
config = {
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
|
||||
# Programs that need to be installed with some extra configuration
|
||||
programs = lib.mkMerge [
|
||||
{
|
||||
# Let Home Manager install and manage itself.
|
||||
home-manager.enable = true;
|
||||
}
|
||||
(lib.mkIf (config.user.isDesktopUser || config.user.isTerminalUser) {
|
||||
# git = {
|
||||
# enable = true;
|
||||
# userName = "Ivy";
|
||||
# userEmail = "ivy@example.com"; # Update this with actual email
|
||||
# extraConfig.init.defaultBranch = "main";
|
||||
# };
|
||||
|
||||
openssh = {
|
||||
enable = true;
|
||||
hostKeys = [
|
||||
{
|
||||
type = "ed25519";
|
||||
path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
|
||||
}
|
||||
];
|
||||
};
|
||||
})
|
||||
(lib.mkIf config.user.isDesktopUser {
|
||||
vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
mutableExtensionsDir = false;
|
||||
|
||||
profiles.default = {
|
||||
enableUpdateCheck = false;
|
||||
enableExtensionUpdateCheck = false;
|
||||
|
||||
extraExtensions = {
|
||||
# Cline extension (Claude AI assistant)
|
||||
claudeDev.enable = true;
|
||||
# Auto Rename Tag
|
||||
autoRenameTag.enable = true;
|
||||
# Live Server
|
||||
liveServer.enable = true;
|
||||
};
|
||||
|
||||
extensions = let
|
||||
extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
|
||||
in (
|
||||
with extension-pkgs.open-vsx; [
|
||||
streetsidesoftware.code-spell-checker
|
||||
]
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
firefox.enable = true;
|
||||
discord.enable = true;
|
||||
signal-desktop-bin.enable = true;
|
||||
claude-code.enable = true;
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -46,6 +46,7 @@ in {
|
|||
})
|
||||
(lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
|
||||
anki.enable = true;
|
||||
android-studio.enable = true;
|
||||
makemkv.enable = true;
|
||||
discord.enable = true;
|
||||
signal-desktop-bin.enable = true;
|
||||
|
|
|
|||
|
|
@ -245,8 +245,6 @@
|
|||
enable = true;
|
||||
exposePort = true;
|
||||
|
||||
acceleration = false;
|
||||
|
||||
environmentVariables = {
|
||||
OLLAMA_KEEP_ALIVE = "24h";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{config, ...}: {
|
||||
# Enable OpenGL
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
isPrincipleUser = true;
|
||||
};
|
||||
eve.isDesktopUser = true;
|
||||
ivy.isDesktopUser = true;
|
||||
};
|
||||
|
||||
hardware = {
|
||||
|
|
@ -85,6 +84,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
cachefilesd
|
||||
webtoon-dl
|
||||
|
|
|
|||
|
|
@ -4,10 +4,6 @@
|
|||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./monitors.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot.initrd.availableKernelModules = ["usb_storage"];
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-id/ata-TOSHIBA_DT01ACA100_77D21HVNS-part2";
|
||||
device = "/dev/disk/by-id/nvme-Samsung_SSD_980_500GB_S64ENJ0RA06463Z-part2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-id/ata-TOSHIBA_DT01ACA100_77D21HVNS-part1";
|
||||
device = "/dev/disk/by-id/nvme-Samsung_SSD_980_500GB_S64ENJ0RA06463Z-part1";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,199 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /run/gdm/.config/monitors.xml - - - - ${pkgs.writeText "gdm-monitors.xml" ''
|
||||
<monitors version="2">
|
||||
<configuration>
|
||||
<logicalmonitor>
|
||||
<x>0</x>
|
||||
<y>156</y>
|
||||
<scale>1</scale>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-4</connector>
|
||||
<vendor>DEL</vendor>
|
||||
<product>DELL U2719D</product>
|
||||
<serial>8RGXNS2</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>2560</width>
|
||||
<height>1440</height>
|
||||
<rate>59.951</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<logicalmonitor>
|
||||
<x>2560</x>
|
||||
<y>324</y>
|
||||
<scale>1</scale>
|
||||
<primary>yes</primary>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-2</connector>
|
||||
<vendor>GSM</vendor>
|
||||
<product>LG ULTRAGEAR</product>
|
||||
<serial>0x00068c96</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>1920</width>
|
||||
<height>1080</height>
|
||||
<rate>240.001</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<logicalmonitor>
|
||||
<x>4480</x>
|
||||
<y>0</y>
|
||||
<scale>1</scale>
|
||||
<transform>
|
||||
<rotation>left</rotation>
|
||||
<flipped>no</flipped>
|
||||
</transform>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>HDMI-0</connector>
|
||||
<vendor>HWP</vendor>
|
||||
<product>HP w2207</product>
|
||||
<serial>CND7332S88</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>1600</width>
|
||||
<height>1000</height>
|
||||
<rate>59.999</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
</configuration>
|
||||
<configuration>
|
||||
<logicalmonitor>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<scale>1</scale>
|
||||
<primary>yes</primary>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-1</connector>
|
||||
<vendor>DEL</vendor>
|
||||
<product>DELL U2719D</product>
|
||||
<serial>8RGXNS2</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>2560</width>
|
||||
<height>1440</height>
|
||||
<rate>59.951</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<logicalmonitor>
|
||||
<x>4480</x>
|
||||
<y>226</y>
|
||||
<scale>1</scale>
|
||||
<transform>
|
||||
<rotation>left</rotation>
|
||||
<flipped>no</flipped>
|
||||
</transform>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>HDMI-1</connector>
|
||||
<vendor>HWP</vendor>
|
||||
<product>HP w2207</product>
|
||||
<serial>CND7332S88</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>1680</width>
|
||||
<height>1050</height>
|
||||
<rate>59.954</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<logicalmonitor>
|
||||
<x>2560</x>
|
||||
<y>226</y>
|
||||
<scale>1</scale>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-2</connector>
|
||||
<vendor>GSM</vendor>
|
||||
<product>LG ULTRAGEAR</product>
|
||||
<serial>0x00068c96</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>1920</width>
|
||||
<height>1080</height>
|
||||
<rate>240.001</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
</configuration>
|
||||
<configuration>
|
||||
<logicalmonitor>
|
||||
<x>2560</x>
|
||||
<y>228</y>
|
||||
<scale>1</scale>
|
||||
<primary>yes</primary>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-2</connector>
|
||||
<vendor>GSM</vendor>
|
||||
<product>LG ULTRAGEAR</product>
|
||||
<serial>0x00068c96</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>1920</width>
|
||||
<height>1080</height>
|
||||
<rate>240.001</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<logicalmonitor>
|
||||
<x>4480</x>
|
||||
<y>69</y>
|
||||
<scale>1</scale>
|
||||
<transform>
|
||||
<rotation>left</rotation>
|
||||
<flipped>no</flipped>
|
||||
</transform>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>HDMI-1</connector>
|
||||
<vendor>HWP</vendor>
|
||||
<product>HP w2207</product>
|
||||
<serial>CND7332S88</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>1680</width>
|
||||
<height>1050</height>
|
||||
<rate>59.954</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<logicalmonitor>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<scale>1</scale>
|
||||
<monitor>
|
||||
<monitorspec>
|
||||
<connector>DP-3</connector>
|
||||
<vendor>DEL</vendor>
|
||||
<product>DELL U2719D</product>
|
||||
<serial>8RGXNS2</serial>
|
||||
</monitorspec>
|
||||
<mode>
|
||||
<width>2560</width>
|
||||
<height>1440</height>
|
||||
<rate>59.951</rate>
|
||||
</mode>
|
||||
</monitor>
|
||||
</logicalmonitor>
|
||||
<disabled>
|
||||
<monitorspec>
|
||||
<connector>None-1</connector>
|
||||
<vendor>unknown</vendor>
|
||||
<product>unknown</product>
|
||||
<serial>unknown</serial>
|
||||
</monitorspec>
|
||||
</disabled>
|
||||
</configuration>
|
||||
</monitors>
|
||||
''}"
|
||||
];
|
||||
}
|
||||
|
|
@ -4,8 +4,9 @@
|
|||
# Load nvidia driver for Xorg and Wayland
|
||||
videoDrivers = ["nvidia"];
|
||||
};
|
||||
# Use X instead of wayland for gaming reasons
|
||||
displayManager.gdm.wayland = false;
|
||||
# Temporarily enable wayland to fix boot issue
|
||||
# TODO: Investigate proper X11 session generation for gaming
|
||||
displayManager.gdm.wayland = true;
|
||||
};
|
||||
|
||||
hardware = {
|
||||
|
|
|
|||
76
flake.lock
generated
76
flake.lock
generated
|
|
@ -25,11 +25,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763651264,
|
||||
"narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=",
|
||||
"lastModified": 1765326679,
|
||||
"narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "e86a89079587497174ccab6d0d142a65811a4fd9",
|
||||
"rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -46,11 +46,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1763697825,
|
||||
"narHash": "sha256-AgCCcVPOi1tuzuW5/StlwqBjRWSX62oL97qWuxrq5UA=",
|
||||
"lastModified": 1765253041,
|
||||
"narHash": "sha256-D4/vwhvX26KW3gux9CCiJ87zc5UOiLTFlfG3+5h0VRI=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "cefce78793603231be226fa77e7ad58e0e4899b8",
|
||||
"rev": "687d6eb2a8503afdeaaf9e230fb72f880daa7252",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -62,11 +62,11 @@
|
|||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"lastModified": 1765121682,
|
||||
"narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -133,11 +133,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763748372,
|
||||
"narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=",
|
||||
"lastModified": 1765217760,
|
||||
"narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1",
|
||||
"rev": "e5b1f87841810fc24772bf4389f9793702000c9b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -185,11 +185,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763435414,
|
||||
"narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=",
|
||||
"lastModified": 1764519849,
|
||||
"narHash": "sha256-XnNABKfIYKSimQVvKc9FnlC2H0LurOhd9MS6l0Z67lE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703",
|
||||
"revCount": 169,
|
||||
"rev": "6c95c0b6f73f831226453fc6905c216ab634c30f",
|
||||
"revCount": 170,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module.git"
|
||||
},
|
||||
|
|
@ -227,11 +227,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763505477,
|
||||
"narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=",
|
||||
"lastModified": 1765065051,
|
||||
"narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5",
|
||||
"rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -268,11 +268,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763690163,
|
||||
"narHash": "sha256-MMl9P8f17unCvlk2IAinnMq/P72f51UUHVRIYnojT7w=",
|
||||
"lastModified": 1765245651,
|
||||
"narHash": "sha256-/+ahII8MXi59KnRmzz+OgPXScr2Oyygin/XJWP7GvdU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "590349d9faeb398a037205c2927ffbaede980539",
|
||||
"rev": "32a0d010099f0b982498b11cc04d5335b0fc1556",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -283,11 +283,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1762847253,
|
||||
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
|
||||
"lastModified": 1764440730,
|
||||
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
|
||||
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -315,11 +315,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1763421233,
|
||||
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
|
||||
"lastModified": 1765186076,
|
||||
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
|
||||
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -352,11 +352,11 @@
|
|||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764204484,
|
||||
"narHash": "sha256-S45ghD/YjcKDy8Mz3DYklLMaA/z6f6mTbx0i7pAktYk=",
|
||||
"lastModified": 1765312847,
|
||||
"narHash": "sha256-8yHfYUiFYQQrtmHl/5jBcrDLgOM8s5vPkAAVu2fiAk0=",
|
||||
"owner": "IntQuant",
|
||||
"repo": "noita_entangled_worlds",
|
||||
"rev": "ab2c2162157140ab519fa19f6737c044e1ed0e3b",
|
||||
"rev": "2957cdaa49117a613c46739e3c65bf28f0662b20",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -409,11 +409,11 @@
|
|||
"secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759945215,
|
||||
"narHash": "sha256-xmUzOuhJl6FtTjR5++OQvSoAnXe7/VA5QFCZDyFwBXo=",
|
||||
"lastModified": 1765740994,
|
||||
"narHash": "sha256-aBs7m69yuiixzGzhUlWAAN+zBziBNII+BFEC/5mPcSI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "444229a105445339fb028d15a8d866063c5f8141",
|
||||
"revCount": 21,
|
||||
"rev": "6e90a73ed2e1e81ba37628fc5e5494a80d22b526",
|
||||
"revCount": 22,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.jan-leila.com/jan-leila/nix-config-secrets.git"
|
||||
},
|
||||
|
|
@ -429,11 +429,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763607916,
|
||||
"narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=",
|
||||
"lastModified": 1765231718,
|
||||
"narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b",
|
||||
"rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
35
modules/home-manager-modules/programs/android-studio.nix
Normal file
35
modules/home-manager-modules/programs/android-studio.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options.programs.android-studio = {
|
||||
enable = lib.mkEnableOption "enable android-studio";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.programs.android-studio.enable (lib.mkMerge [
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
android-studio
|
||||
];
|
||||
}
|
||||
# TODO: create this
|
||||
# (
|
||||
# lib.mkIf config.impermanence.enable {
|
||||
# home.persistence."/persist${config.home.homeDirectory}" = {
|
||||
# directories = [
|
||||
# # configuration
|
||||
# "${config.xdg.configHome}/Google/AndroidStudio"
|
||||
# # Android SDK
|
||||
# ".android"
|
||||
# # Gradle cache
|
||||
# ".gradle"
|
||||
# # Android Studio projects cache
|
||||
# "${config.xdg.cacheHome}/Google/AndroidStudio"
|
||||
# ];
|
||||
# };
|
||||
# }
|
||||
# )
|
||||
]);
|
||||
}
|
||||
|
|
@ -4,10 +4,6 @@
|
|||
config,
|
||||
...
|
||||
}: {
|
||||
options.programs.calibre = {
|
||||
enable = lib.mkEnableOption "enable calibre";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.programs.calibre.enable (lib.mkMerge [
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./android-studio.nix
|
||||
./firefox.nix
|
||||
./signal.nix
|
||||
./bitwarden.nix
|
||||
|
|
|
|||
|
|
@ -47,6 +47,9 @@
|
|||
|
||||
# Get rid of xTerm
|
||||
desktopManager.xterm.enable = false;
|
||||
excludePackages = with pkgs; [
|
||||
xterm
|
||||
];
|
||||
};
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@
|
|||
uids = {
|
||||
leyla = 1000;
|
||||
eve = 1002;
|
||||
ivy = 1004;
|
||||
# ester = 1003;
|
||||
# ivy = 1004;
|
||||
jellyfin = 2000;
|
||||
forgejo = 2002;
|
||||
hass = 2004;
|
||||
|
|
@ -36,7 +37,8 @@
|
|||
gids = {
|
||||
leyla = 1000;
|
||||
eve = 1002;
|
||||
ivy = 1004;
|
||||
# ester = 1003
|
||||
# ivy = 1004;
|
||||
users = 100;
|
||||
jellyfin_media = 2001;
|
||||
jellyfin = 2000;
|
||||
|
|
@ -59,7 +61,6 @@
|
|||
users = config.users.users;
|
||||
leyla = users.leyla.name;
|
||||
eve = users.eve.name;
|
||||
ivy = users.ivy.name;
|
||||
in {
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
|
|
@ -97,10 +98,6 @@ in {
|
|||
neededForUsers = true;
|
||||
sopsFile = "${inputs.secrets}/user-passwords.yaml";
|
||||
};
|
||||
"passwords/ivy" = {
|
||||
neededForUsers = true;
|
||||
sopsFile = "${inputs.secrets}/user-passwords.yaml";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -113,7 +110,7 @@ in {
|
|||
description = "Leyla";
|
||||
extraGroups =
|
||||
(lib.lists.optionals host.users.leyla.isNormalUser ["networkmanager"])
|
||||
++ (lib.lists.optionals host.users.leyla.isPrincipleUser ["wheel" "dialout"])
|
||||
++ (lib.lists.optionals host.users.leyla.isPrincipleUser ["wheel" "dialout" "docker"])
|
||||
++ (lib.lists.optionals host.users.leyla.isDesktopUser ["adbusers"]);
|
||||
hashedPasswordFile = config.sops.secrets."passwords/leyla".path;
|
||||
isNormalUser = host.users.leyla.isNormalUser;
|
||||
|
|
@ -134,19 +131,6 @@ in {
|
|||
group = config.users.users.eve.name;
|
||||
};
|
||||
|
||||
ivy = {
|
||||
uid = lib.mkForce uids.ivy;
|
||||
name = lib.mkForce host.users.ivy.name;
|
||||
description = "Ivy";
|
||||
extraGroups =
|
||||
lib.optionals host.users.ivy.isNormalUser ["networkmanager"]
|
||||
++ (lib.lists.optionals host.users.ivy.isPrincipleUser ["wheel"]);
|
||||
hashedPasswordFile = config.sops.secrets."passwords/ivy".path;
|
||||
isNormalUser = host.users.ivy.isNormalUser;
|
||||
isSystemUser = !host.users.ivy.isNormalUser;
|
||||
group = config.users.users.ivy.name;
|
||||
};
|
||||
|
||||
jellyfin = {
|
||||
uid = lib.mkForce uids.jellyfin;
|
||||
isSystemUser = true;
|
||||
|
|
@ -254,19 +238,11 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
ivy = {
|
||||
gid = lib.mkForce gids.ivy;
|
||||
members = [
|
||||
ivy
|
||||
];
|
||||
};
|
||||
|
||||
users = {
|
||||
gid = lib.mkForce gids.users;
|
||||
members = [
|
||||
leyla
|
||||
eve
|
||||
ivy
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -280,7 +256,6 @@ in {
|
|||
users.lidarr.name
|
||||
leyla
|
||||
eve
|
||||
ivy
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -314,7 +289,6 @@ in {
|
|||
users.syncthing.name
|
||||
leyla
|
||||
eve
|
||||
ivy
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -89,11 +89,6 @@ in {
|
|||
isDesktopUser = lib.mkDefault false;
|
||||
isTerminalUser = lib.mkDefault false;
|
||||
};
|
||||
ivy = {
|
||||
isPrincipleUser = lib.mkDefault false;
|
||||
isDesktopUser = lib.mkDefault false;
|
||||
isTerminalUser = lib.mkDefault false;
|
||||
};
|
||||
};
|
||||
|
||||
assertions =
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 444229a105445339fb028d15a8d866063c5f8141
|
||||
Subproject commit 6e90a73ed2e1e81ba37628fc5e5494a80d22b526
|
||||
Loading…
Add table
Add a link
Reference in a new issue