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

Compare commits

base: PapaTutuWawa:55dcc4e3dca00e02bf0475b731681f901aea0a48
Branches Tags
PapaTutuWawa:master
..
compare: PapaTutuWawa:ffaf192563dec6b8d071f24369df6f4fcf482238
Branches Tags
PapaTutuWawa:master

No commits in common. "55dcc4e3dca00e02bf0475b731681f901aea0a48" and "ffaf192563dec6b8d071f24369df6f4fcf482238" have entirely different histories.
55dcc4e3dc ... ffaf192563

9 changed files with 69 additions and 154 deletions
Show Stats Expand all files Collapse all files

172
flake.lock
View File

@ -2,7 +2,7 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1640802000, "lastModified": 1640802000,
@ -19,16 +19,12 @@
} }
}, },
"emacs": { "emacs": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1652416036, "lastModified": 1650684053,
"narHash": "sha256-cfNmuHmGwdhHB9/BT1dDxo5anYFAewuvZ/wVFDAgl8w=", "narHash": "sha256-t+EH8O3a+Aajv+uYGzUrF1R1w/6GD4retFAxb23yz90=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9c90a10f7c5d4e99392090820460c1fa7486ae2c", "rev": "46041a0711e643c8911845878fa4604dc8669a66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +56,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1652372896, "lastModified": 1649676176,
"narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121", "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +71,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1652372896, "lastModified": 1638122382,
"narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +86,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1644229661,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,31 +129,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1652214259, "lastModified": 1650478719,
"narHash": "sha256-kbribVik1m3SU6QNpZ3euybljqs0CEQ0lEEz7MN+u8U=", "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f735a8502b098962ae965c2600c7be9f7711b814", "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,7 +248,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1639947939, "lastModified": 1639947939,
@ -285,7 +266,7 @@
}, },
"naersk_2": { "naersk_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1639947939, "lastModified": 1639947939,
@ -336,8 +317,8 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
"path": "/nix/store/h96rpxzp4q192r3fnwzclg3rmdg4nlqk-source", "path": "/nix/store/dir0rn9a585sjc5aw78xs744yvd7ks7n-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -361,41 +342,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_10": {
"locked": {
"lastModified": 1645373091,
"narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0ae0897999e7ba4615e02ca1770df6065099daf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1650161686,
"narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
"path": "/nix/store/h96rpxzp4q192r3fnwzclg3rmdg4nlqk-source",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1652231724,
"narHash": "sha256-MjalcXFZgcgchp4QqnF05JTkFBBGad5hbksA1EKoP98=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "41ff747f882914c1f8c233207ce280ac9d0c867f", "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,7 +358,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1618628710, "lastModified": 1618628710,
"narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=", "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=",
@ -418,7 +371,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1649490789, "lastModified": 1649490789,
"narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=", "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
@ -434,7 +387,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1640233012, "lastModified": 1640233012,
"narHash": "sha256-DNKMmWZ/RLoh5IVJLAa5HYOy4IW28mBBYDMgMxzzom8=", "narHash": "sha256-DNKMmWZ/RLoh5IVJLAa5HYOy4IW28mBBYDMgMxzzom8=",
@ -447,7 +400,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1645373091, "lastModified": 1645373091,
"narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=", "narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=",
@ -463,7 +416,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1645010845, "lastModified": 1645010845,
"narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=", "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=",
@ -476,7 +429,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_9": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1642190797, "lastModified": 1642190797,
"narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=", "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
@ -492,13 +445,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1645373091,
"narHash": "sha256-eRbiakFKdxtjrqOtErp4BgOJlLN5VEBymldfxy+ZKzI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0ae0897999e7ba4615e02ca1770df6065099daf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1652434939, "lastModified": 1650681389,
"narHash": "sha256-LyaBhP8pu8NZs3BTOftUR9NlNoNoOYxxfuTCw8wtTTE=", "narHash": "sha256-76az6Z4umzHZcMi2N9cdL5gJkxagsJEHveO4+l7wAdU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "01f680baba2cfd204d52b1a7f9db61a4ecf7af80", "rev": "bd3cf2bcbd62f3bc66e90c1dd5a00fa933cb861e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -510,11 +479,11 @@
"ostylk": { "ostylk": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware_2", "nixos-hardware": "nixos-hardware_2",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"rnix-lsp": "rnix-lsp", "rnix-lsp": "rnix-lsp",
"tablet-mode": "tablet-mode" "tablet-mode": "tablet-mode"
@ -536,21 +505,20 @@
"ostylk-home": { "ostylk-home": {
"inputs": { "inputs": {
"flake-helper": "flake-helper", "flake-helper": "flake-helper",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"home-stable": "home-stable", "home-stable": "home-stable",
"home-unstable": "home-unstable", "home-unstable": "home-unstable",
"linux-surface": "linux-surface", "linux-surface": "linux-surface",
"pkg-compile": "pkg-compile",
"pkg-stable": "pkg-stable", "pkg-stable": "pkg-stable",
"pkg-unstable": "pkg-unstable", "pkg-unstable": "pkg-unstable",
"rnix-lsp": "rnix-lsp_2" "rnix-lsp": "rnix-lsp_2"
}, },
"locked": { "locked": {
"lastModified": 1650719165, "lastModified": 1650633525,
"narHash": "sha256-ltv2f8JpgivJXSstwYIENB19XPwwDgG08+7m+6B7OIY=", "narHash": "sha256-QJSUeNn56J1PEa211GorvkTMOeNiN55DceeVIhLoVnY=",
"ref": "master", "ref": "master",
"rev": "13737294b4e8d4dd22d889846731a2abf5ab17e5", "rev": "8620fb21d8fb74352ca289c145a8db868e087e75",
"revCount": 62, "revCount": 61,
"type": "git", "type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
}, },
@ -559,22 +527,6 @@
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
} }
}, },
"pkg-compile": {
"locked": {
"lastModified": 1650161686,
"narHash": "sha256-BXzQV8p/RR440EB9qY0ULYfTH0zSW1stjUCYeP4SF+E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1d08ea2bd83abef174fb43cbfb8a856b8ef2ce26",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pkg-stable": { "pkg-stable": {
"locked": { "locked": {
"lastModified": 1647992509, "lastModified": 1647992509,
@ -634,7 +586,7 @@
"rnix-lsp_2": { "rnix-lsp_2": {
"inputs": { "inputs": {
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
@ -655,10 +607,10 @@
"root": { "root": {
"inputs": { "inputs": {
"emacs": "emacs", "emacs": "emacs",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"ostylk": "ostylk", "ostylk": "ostylk",
"ostylk-home": "ostylk-home", "ostylk-home": "ostylk-home",
@ -684,8 +636,8 @@
}, },
"tablet-mode": { "tablet-mode": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1645816436, "lastModified": 1645816436,
@ -703,8 +655,8 @@
}, },
"tablet-mode_2": { "tablet-mode_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1645816436, "lastModified": 1645816436,

3
modules/default.nix
View File

@ -47,9 +47,6 @@
./virtualisation/default.nix ./virtualisation/default.nix
./virtualisation/gaming.nix ./virtualisation/gaming.nix
# Security
./security/apparmor.nix
# Pure options # Pure options
./base.nix ./base.nix
]; ];

4
modules/programs/emacs/default.nix
View File

@ -16,8 +16,8 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ emacs28NativeComp ]; environment.systemPackages = with pkgs; [ emacsPgtkGcc ];
services.emacs.package = pkgs.emacs28NativeComp; services.emacs.package = pkgs.emacsPgtkGcc;
home-manager.users."${config.ptw.system.singleUser}" = { home-manager.users."${config.ptw.system.singleUser}" = {
home.file = { home.file = {

2
modules/programs/gaming/default.nix
View File

@ -22,7 +22,7 @@ in {
steam-wrapped # Custom package steam-wrapped # Custom package
#nur.repos.dukzcry.gamescope nur.repos.dukzcry.gamescope
corectrl corectrl
]; ];

2
modules/programs/plasma/default.nix
View File

@ -40,7 +40,7 @@ in {
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde
libsForQt5.breeze-gtk libsForQt5.breeze-gtk
libsForQt5.bismuth libsForQt5.bismuth
kde-rounded-corners #kde-rounded-corners
index-fm index-fm
rsibreak rsibreak
kalendar kalendar

24
modules/security/apparmor.nix
View File

@ -1,24 +0,0 @@
{ config, lib, pkgs, ... }:
let
cfg = config.ptw.security.apparmor;
in {
options.ptw.security.apparmor = {
enable = lib.mkEnableOption "Enable AppArmor";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
apparmor-bin-utils
];
services.dbus.apparmor = "enabled";
security.apparmor = {
enable = true;
enableCache = true;
includes = {
profiles = "${pkgs.apparmor-profiles}/etc/apparmor.d";
};
};
};
}

10
overlays/sandbox.nix
View File

@ -39,11 +39,7 @@ in {
name = "steam-wrapped"; name = "steam-wrapped";
binary = "${prev.steam}/bin/steam"; binary = "${prev.steam}/bin/steam";
launchScriptName = "steam"; launchScriptName = "steam";
mountInHome = [ mountInHome = [ ".steam" ".local/share/Steam" ];
".steam"
".local/share/Steam"
"Downloads/Skyrim Mods"
];
additionalBlacklist = [ "/mnt" ]; additionalBlacklist = [ "/mnt" ];
additionalMounts = [ "/mnt/Storage/Games/SteamLibrary" ]; additionalMounts = [ "/mnt/Storage/Games/SteamLibrary" ];
chdirTo = "/home/$USER"; chdirTo = "/home/$USER";
@ -83,9 +79,7 @@ in {
launchScriptName = "lutris"; launchScriptName = "lutris";
binary = "${prev.lutris-free}/bin/lutris"; binary = "${prev.lutris-free}/bin/lutris";
additionalBlacklist = [ "/mnt" ]; additionalBlacklist = [ "/mnt" ];
additionalMounts = [ additionalMounts = [ "/mnt/Storage/Games/" ];
"/mnt/Storage/Games/LeagueOfLegends"
];
mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ]; mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ];
chdirTo = "/home/$USER"; chdirTo = "/home/$USER";

4
overlays/simple.nix
View File

@ -10,10 +10,6 @@ final: prev:
extraPkgs = pkgs: with final; [ mpv ]; extraPkgs = pkgs: with final; [ mpv ];
}); });
lutris-free = prev.lutris-free.override {
extraPkgs = ps: with ps; [ openssl ];
};
retroarch = prev.retroarch.override (old: { retroarch = prev.retroarch.override (old: {
cores = with prev.libretro; [ cores = with prev.libretro; [
desmume desmume

2
packages/applications/networking/instant-messengers/gajim/default.nix
View File

@ -49,7 +49,7 @@ in python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools gsound nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools gsound
gst-python gtksourceview4 packaging gst-python gtksourceview4
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils ++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]