AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update and cleanup

Browse Source
This commit is contained in:
Dmitriy Kholkin 2022-06-06 20:26:10 +03:00
parent b1d142b5ed
commit 59ae38770e
7 changed files with 79 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
flake.lock generated
View File

@ -3,11 +3,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1652124318, "lastModified": 1654091479,
"narHash": "sha256-Ypd/awDTLgKwxfUQsDOPj0/V6QfPKmoMgOkGoO+FZwQ=", "narHash": "sha256-fw8BZSCgEMLAD1IYvnCxTwYAPCrobZmmE7Y+foydkLk=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "ea139e3ef8810149d90df8637984f2444282745e", "rev": "662eddbc2124d9d09774da7d5bc385f45c287c0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,11 +84,11 @@
}, },
"cachix": { "cachix": {
"locked": { "locked": {
"lastModified": 1652559422, "lastModified": 1653996475,
"narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1652776076, "lastModified": 1653893745,
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1652452047, "lastModified": 1654422613,
"narHash": "sha256-O6DI0dMH/5rNM+z9CQ/nqRMNBpNsU7TtLSsafKLZTHY=", "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "32a7da69dc53c9eb5ad0675eb7fdc58f7fe35272", "rev": "20703892473d01c70fb10248442231fe94f4ceb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1652789450, "lastModified": 1653912655,
"narHash": "sha256-R7T3+YrQOvljHlZ/keCUN0EzTLOzpRv48YkBi9ZdQUI=", "narHash": "sha256-sSBnbOqyVvV7CKq4jAmoZwd0VpYje1Yk0xSSmiSczCs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "c545346bf708ae7c1330b84dadd06f8610864deb", "rev": "93e3b4ce728ebcb91e8e47101ec4cd6c53c63dee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1652714023, "lastModified": 1654239108,
"narHash": "sha256-ECgV4VU2VmrVKPiBVn0YrsJk0+qa46BwTU6S+lA/ANE=", "narHash": "sha256-0JzuElxLe5DxM+R4tvBYfvQnMGCERZy4KMRf0JYxxS4=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "fdc97fc3f93c2afbd260b538b3546e14c0dcd134", "rev": "1dd7253133c4dfd2e7a16ad6fe505442cef38a5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +326,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1652576347, "lastModified": 1653785473,
"narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", "narHash": "sha256-kqSk70xGTRfmJi2XPfpxF4ckfrlB0bf9vmN1V3aydTA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "bdf553800c9c34ed00641785b02038f67f44d671", "rev": "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +341,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1652820529, "lastModified": 1654429103,
"narHash": "sha256-cabu+fNMDrFNfb3ygRIQku+3Dq3dQ8h9/WkOf8RIrXY=", "narHash": "sha256-xpSQ0UJGrwCGEye29IHcSZZEtSem+U7uvaFPRem+ZoE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "acc4a0bbb9485e155e0a20786f9f48d7eda0ba40", "rev": "88e0f07bd610fb9dd41c166ed3769fb83fd10af5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,18 +381,19 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "indirect" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1652559422, "lastModified": 1653996475,
"narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +413,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1652790962, "lastModified": 1654425625,
"narHash": "sha256-UrjM9MJGf8nTF3cDyqXYVsBSkqge3D6eyO3Jdk2ebtY=", "narHash": "sha256-wSRwf3acRxAMqFsMvli3LSnpTMiFO/LEvKyc+GwJKAE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "d1400730b983f6cb257025d4cced6f12c7fe4142", "rev": "7c64142116dbdbf8b1b3e60110af5beb64b57085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -435,22 +436,23 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-21.05-small", "ref": "nixos-21.05-small",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1652659998, "lastModified": 1654431174,
"narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=", "narHash": "sha256-oQLZA/bJmsi7tGY6KLqeOhgQ/9f4I3RyAgo/aCvhMGc=",
"owner": "nixos", "owner": "AlukardBF",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502", "rev": "a97502f2a652f1251fa83a3f975d20c997b8166a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "AlukardBF",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -458,11 +460,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1652788466, "lastModified": 1654423064,
"narHash": "sha256-MucW4KAyvuoBrd4vcGEeCMsgBuXokTWxPF0Yco6MiSI=", "narHash": "sha256-X3u2YCDQTiMU+geriz0bjLEJFIxXs1GOVEo8WKEi4Ic=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "70c8f5f2dade67514cb191e552266e2683b8a319", "rev": "522188d4fe94df9958d2c8f1271e21210394523f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,11 +524,11 @@
"qbittorrent-ee": { "qbittorrent-ee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1649528993, "lastModified": 1654043540,
"narHash": "sha256-z1zb84soyQIeUDIuxCCmxtf8cOLCPPhEQUvrXg3lp2k=", "narHash": "sha256-c2+QK+ieXIhh8/K04U3kCIqFXf5yce9xZelsnVMS3qk=",
"owner": "c0re100", "owner": "c0re100",
"repo": "qBittorrent-Enhanced-Edition", "repo": "qBittorrent-Enhanced-Edition",
"rev": "ab45816bcfafb8633864af9739e667f1ebb9794b", "rev": "683ecc7a7379b6e1cf87e06e8fc77967b5076224",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,11 +584,11 @@
"rycee": { "rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1652760149, "lastModified": 1654423034,
"narHash": "sha256-Z302ru7nbYRfEg2GdBQI4fU13BQyGTVQqTItROJ1byk=", "narHash": "sha256-f5eiXLH4sFUD5pvGNdsiFRGjjNcDnwF+gOn3dmWVew0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "90b2335b04bb625fae1e6648b30be35e176d82c7", "rev": "a7c9b8b161267a74784460cfe21d3d16eed8b114",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -604,11 +606,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1652050932, "lastModified": 1653423337,
"narHash": "sha256-1lOa33Z2sC6CmNdqkCtplVHlMUWVZl4FLT6MYOM+WJQ=", "narHash": "sha256-TLNyDhwhQWimt5QWzFf/3B7lKk5isdICNRTwiCAhiB0=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "4396125ebbbaecbaba0f8e0afb25e492b3be5795", "rev": "15cf252a0dfffb2420a60fbd6be3467c11026142",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

3
flake.nix
View File

@ -2,7 +2,8 @@
description = "System configuration"; description = "System configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:AlukardBF/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-21.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-21.11";
nixpkgs-wayland = { nixpkgs-wayland = {

3
profiles/applications-setup.nix
View File

@ -36,9 +36,6 @@
startupApplications = with config.defaultApplications; [ startupApplications = with config.defaultApplications; [
messenger.cmd messenger.cmd
"${pkgs.keepassxc}/bin/keepassxc --keyfile=/home/alukard/.passwords.key /home/alukard/nixos-config/misc/Passwords.kdbx"
# "${term.cmd} -e spt"
# "${pkgs.feh}/bin/feh --bg-fill ${/. + ../misc/wallpaper}"
]; ];
environment.sessionVariables = { environment.sessionVariables = {

7
profiles/applications/packages.nix
View File

@ -53,7 +53,6 @@ with config.deviceSpecific; {
foliate foliate
gparted gparted
jellyfin-media-player jellyfin-media-player
keepassxc
# persepolis # persepolis
pinta pinta
qbittorrent qbittorrent
@ -83,18 +82,14 @@ with config.deviceSpecific; {
] ++ lib.optionals isGaming [ ] ++ lib.optionals isGaming [
# ceserver # ceserver
# ckan # ckan
# gamescope
goverlay goverlay
multimc
lutris lutris
obs-studio obs-studio
polymc polymc
reshade-shaders reshade-shaders
# (retroarch.override { cores = [ libretro.genesis-plus-gx ]; }) (retroarch.override { cores = [ libretro.genesis-plus-gx libretro.dosbox ]; })
protontricks protontricks
vkBasalt vkBasalt
# wine
# winetricks
] ++ lib.optionals isLaptop [ ] ++ lib.optionals isLaptop [
acpi acpi
seadrive-fuse seadrive-fuse

11
profiles/filesystems.nix
View File

@ -4,9 +4,12 @@ with rec {
}; };
with deviceSpecific; with deviceSpecific;
{ {
secrets.samba = { secrets.samba.services = [];
services = [ ]; secrets.files-veracrypt = {};
};
environment.etc.crypttab.text = lib.mkIf (device == "AMD-Workstation") ''
files-veracrypt /dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a /var/secrets/files-veracrypt tcrypt-veracrypt
'';
fileSystems = { fileSystems = {
"/shared/nixos" = lib.mkIf isVM { "/shared/nixos" = lib.mkIf isVM {
@ -53,7 +56,7 @@ with deviceSpecific;
"/media/files" = lib.mkIf (device == "AMD-Workstation") { "/media/files" = lib.mkIf (device == "AMD-Workstation") {
# Samba host # Samba host
fsType = "ntfs"; fsType = "ntfs";
device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f"; device = "/dev/mapper/files-veracrypt";
options = [ options = [
# "noatime" # "noatime"
"nofail" "nofail"

16
profiles/workspace/cursor.nix
View File

@ -1,21 +1,21 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
let let
thm = config.lib.base16.theme; thm = config.lib.base16.theme;
profileDir = config.home-manager.users.alukard.home.profileDirectory;
in { in {
environment.sessionVariables = { environment.sessionVariables = {
XCURSOR_PATH = lib.mkForce "/home/alukard/.icons"; XCURSOR_PATH = lib.mkForce "${profileDir}/share/icons";
XCURSOR_SIZE = lib.mkForce (toString thm.cursorSize);
}; };
home-manager.users.alukard = { home-manager.users.alukard = {
xsession.pointerCursor = { home.pointerCursor = {
package = thm.cursorPackage; package = thm.cursorPackage;
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
size = thm.cursorSize; size = thm.cursorSize;
gtk.enable = true;
# x11.enable = true;
}; };
# home.file.".icons/default" = {
home.file.".icons/default" = { # source = "${thm.cursorPackage}/share/icons/Bibata-Modern-Classic";
source = "${thm.cursorPackage}/share/icons/Bibata-Modern-Classic"; # };
};
}; };
} }

8
profiles/workspace/ssh.nix
View File

@ -32,6 +32,14 @@ with config.deviceSpecific; {
hostname = "192.168.0.12"; hostname = "192.168.0.12";
user = "alukard"; user = "alukard";
}; };
"dell.ataraxia" = {
hostname = "192.168.0.101";
user = "alukard";
};
"amd.ataraxia" = {
hostname = "192.168.0.100";
user = "alukard";
};
}; };
extraConfig = '' extraConfig = ''
Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"