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

flake: Update

Browse Source
This commit is contained in:
PapaTutuWawa 2022-09-13 08:39:12 +02:00
parent 5f2172f2a5
commit 52b5079e30
6 changed files with 156 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
flake.lock
View File

@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1659725244,
"narHash": "sha256-/oaW2+SP6OfRtbN+wnfL9kr0wnkYKL9Ph7BCpMXHjok=",
"lastModified": 1662958374,
"narHash": "sha256-MpyHx+UjOA8Zi0r0dRKRL509Wqz7JFWI7XFJJstL10w=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "9f5f21345981a89c1ddaf13eb2b7b8417c8e1716",
"rev": "46c1067b0b397df28de5e8f551d2df54f7da7a93",
"type": "github"
},
"original": {
@ -47,7 +47,7 @@
"locked": {
"lastModified": 1649622552,
"narHash": "sha256-KT5CPoqkB9HZqw/pqynczRzsH/PQTImfaY5Oyyy871I=",
"ref": "master",
"ref": "refs/heads/master",
"rev": "3d7c14e55cb8374de6fcd40fcc889aa377131ac2",
"revCount": 6,
"type": "git",
@ -60,11 +60,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@ -75,11 +75,11 @@
},
"flake-utils_2": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@ -120,11 +120,11 @@
},
"flake-utils_5": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@ -154,11 +154,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1659484873,
"narHash": "sha256-6VoPiGyDdjBHOJ3IpS24lY1lrDiOHeuEefOFI0qz3WE=",
"lastModified": 1662759269,
"narHash": "sha256-lt8bAfEZudCQb+MxoNKmenhMTXhu3RCCyLYxU9t5FFk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d8d9ff0b2df77defa10375c6665b51f0251c34d6",
"rev": "9f7fe353b613d0e45d7a5cdbd1f13c96c15803dd",
"type": "github"
},
"original": {
@ -198,11 +198,11 @@
]
},
"locked": {
"lastModified": 1653518057,
"narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
"lastModified": 1656169755,
"narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
"rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
"type": "github"
},
"original": {
@ -217,14 +217,15 @@
"nixpkgs": [
"ostylk-home",
"pkg-unstable"
]
],
"utils": "utils_3"
},
"locked": {
"lastModified": 1653518057,
"narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
"lastModified": 1660330190,
"narHash": "sha256-RgQUtZGmdb9fRkdBcI8x1KYuykbQCBaeY6ejFls7hFM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
"rev": "8675cfa549e1240c9d2abb1c878bc427eefcf926",
"type": "github"
},
"original": {
@ -249,14 +250,47 @@
"type": "github"
}
},
"impermanence_2": {
"locked": {
"lastModified": 1646131459,
"narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "impermanence",
"type": "github"
}
},
"libwacom-surface": {
"flake": false,
"locked": {
"lastModified": 1655824681,
"narHash": "sha256-mXSvD7iyTK48oniIQGudNv67UVY1FCpF9LsSGJvN0xE=",
"owner": "linux-surface",
"repo": "libwacom-surface",
"rev": "e029960464251fce0966207e7428f0b2ffb3dbf7",
"type": "github"
},
"original": {
"owner": "linux-surface",
"ref": "master",
"repo": "libwacom-surface",
"type": "github"
}
},
"linux-surface": {
"flake": false,
"locked": {
"lastModified": 1648391001,
"narHash": "sha256-vi7aCcIcki+ZKXarU5ITKtViaRQyG1rcrbOJyxFnaV0=",
"lastModified": 1660144070,
"narHash": "sha256-nPdPtmnm/BjrwGvPy3OCeLXGPFRQxED9bo2W2GA5SKg=",
"owner": "linux-surface",
"repo": "linux-surface",
"rev": "4789818ac6bfff23619ee4d590e02e58107be2ea",
"rev": "42d9466dc7b6c433fbc80f88f0f68451fab017d9",
"type": "github"
},
"original": {
@ -286,14 +320,18 @@
},
"naersk_2": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": [
"ostylk-home",
"rnix-lsp",
"nixpkgs"
]
},
"locked": {
"lastModified": 1639947939,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"lastModified": 1655042882,
"narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
"owner": "nix-community",
"repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
"type": "github"
},
"original": {
@ -304,11 +342,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1659356074,
"narHash": "sha256-UwV6hZZEtchvtiTCCD/ODEv1226eam8kEgEyQb7xB0E=",
"lastModified": 1662714967,
"narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "ea3efc80f8ab83cb73aec39f4e76fe87afb15a08",
"rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6",
"type": "github"
},
"original": {
@ -337,8 +375,8 @@
"nixpkgs": {
"locked": {
"lastModified": 0,
"narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
"path": "/nix/store/xjy7dk6ps8vzlghg3f27mrzp0gpy6vxx-source",
"narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=",
"path": "/nix/store/5356r3f8pfz731rwcm1xrwaqqcbrq8gg-source",
"type": "path"
},
"original": {
@ -362,22 +400,6 @@
"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": {
"locked": {
"lastModified": 1654953433,
@ -396,11 +418,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1659522808,
"narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=",
"lastModified": 1662911228,
"narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "168d1c578909dc143ba52dbed661c36e76b12b36",
"rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90",
"type": "github"
},
"original": {
@ -470,40 +492,43 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1645010845,
"narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=",
"path": "/nix/store/hkl03hpzvq0pj2qkc56485dd8fm27nng-source",
"rev": "2128d0aa28edef51fd8fef38b132ffc0155595df",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1642190797,
"narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
"rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"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": {
"locked": {
"lastModified": 1659725711,
"narHash": "sha256-NuGn7APbFomuhacyLAdHnNw4GL9RNTNpYemrT1oF5d4=",
"lastModified": 1662966217,
"narHash": "sha256-jLOh0txlWYlvvSUJmPLdfdaaUuoqRJjGPEEUKF2ya94=",
"owner": "nix-community",
"repo": "nur",
"rev": "9c33c27c4ac86945dbb9864ee3fe9833c15c9707",
"rev": "fbba74f5057f1941066ecca23c681adf6738e5c9",
"type": "github"
},
"original": {
@ -544,6 +569,8 @@
"flake-utils": "flake-utils_5",
"home-stable": "home-stable",
"home-unstable": "home-unstable",
"impermanence": "impermanence_2",
"libwacom-surface": "libwacom-surface",
"linux-surface": "linux-surface",
"pkg-compile": "pkg-compile",
"pkg-stable": "pkg-stable",
@ -551,11 +578,11 @@
"rnix-lsp": "rnix-lsp_2"
},
"locked": {
"lastModified": 1654961905,
"narHash": "sha256-sMIhLZwZ/yMQg4+J3y2ycCUfeXbWzj2PSsg+CGDgI48=",
"lastModified": 1660515901,
"narHash": "sha256-5sQVUgj9vnDW8hPIrynGviUXFPADrrL9X4qm3SLbqPM=",
"ref": "refs/heads/master",
"rev": "7513f8c50469f727eadf80fdeca92477e8daef51",
"revCount": 71,
"rev": "48fa0996c44bc160802faaad2692ccfbbfb2647b",
"revCount": 98,
"type": "git",
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
},
@ -566,11 +593,11 @@
},
"pkg-compile": {
"locked": {
"lastModified": 1650161686,
"narHash": "sha256-BXzQV8p/RR440EB9qY0ULYfTH0zSW1stjUCYeP4SF+E=",
"lastModified": 1659803779,
"narHash": "sha256-+5zkHlbcbFyN5f3buO1RAZ9pH1wXLxCesUJ0vFmLr9Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1d08ea2bd83abef174fb43cbfb8a856b8ef2ce26",
"rev": "f44884060cb94240efbe55620f38a8ec8d9af601",
"type": "github"
},
"original": {
@ -582,11 +609,11 @@
},
"pkg-stable": {
"locked": {
"lastModified": 1653733789,
"narHash": "sha256-VIYazYCWNvcFNns2XQkHx/mVmCZ3oebZv8W2LS1gLQE=",
"lastModified": 1660215038,
"narHash": "sha256-tqMyd5QB4MZh59wMHXqpro4hkKjz9ubQxkxFSuCuBGE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d1086907f56c5a6c33c0c2e8dc9f42ef6988294f",
"rev": "45c9736ed69800a6ff2164fb4538c9e40dad25d6",
"type": "github"
},
"original": {
@ -598,11 +625,11 @@
},
"pkg-unstable": {
"locked": {
"lastModified": 1653581809,
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
"lastModified": 1660162369,
"narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
"rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2",
"type": "github"
},
"original": {
@ -639,15 +666,15 @@
"rnix-lsp_2": {
"inputs": {
"naersk": "naersk_2",
"nixpkgs": "nixpkgs_9",
"utils": "utils_3"
"nixpkgs": "nixpkgs_8",
"utils": "utils_4"
},
"locked": {
"lastModified": 1643586450,
"narHash": "sha256-BRIAc3+zavSlJPYSbov2n1W9/a4Iuh2swFPYRWjCm1g=",
"lastModified": 1658963292,
"narHash": "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=",
"owner": "nix-community",
"repo": "rnix-lsp",
"rev": "41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0",
"rev": "ff18e04551a39ccdab0ff9c83926db3807b23478",
"type": "github"
},
"original": {
@ -673,11 +700,11 @@
},
"stable": {
"locked": {
"lastModified": 1659451223,
"narHash": "sha256-PExF4Niw8xYe2tK6qrDtD1ASDoChJfeio99lvGoF8Zo=",
"lastModified": 1659914493,
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7ca652795e39b1c61250546492e4f417185246cb",
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
"type": "github"
},
"original": {
@ -709,7 +736,7 @@
"tablet-mode_2": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1645816436,
@ -757,11 +784,26 @@
},
"utils_3": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -56,7 +56,7 @@
];
};
in {
inherit (pkgs) gamescope custom-apparmor-utils;
inherit (pkgs) gamescope custom-apparmor-utils authelia;
};
});
}

13
hosts/miku.nix
View File

@ -65,7 +65,8 @@
alacritty.enable = true;
emacs.enable = true;
firefox.enable = true;
git.enable = true; #gnome-terminal.enable = true;
git.enable = true;
gnome-terminal.enable = true;
tmux.enable = true;
waybar = {
enable = true;
@ -76,7 +77,7 @@
direnv.enable = true;
office.enable = true;
plasma = {
enable = true;
enable = false;
sddm = {
backgroundImage = pkgs.fetchurl {
url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg";
@ -89,15 +90,15 @@
};
services = {
gamemode.enable = true;
#gnome.enable = true;
gnome.enable = true;
logiops.enable = true;
input-remapper = {
enable = true;
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
};
#gdm = {
# enable = true;
#};
gdm = {
enable = true;
};
};
system = {
i18n.enable = true;

3
lib/baseSystem.nix
View File

@ -98,7 +98,7 @@ in {
# Coding fonts
source-code-pro
# Icon fonts
nerdfonts
#nerdfonts
];
# We don't tolerate non-free software, except for Steam and Linux firmware
@ -111,7 +111,6 @@ in {
];
services = {
# TODO: Is this correct? Maybe run once
timesyncd.enable = false;
# Everyone needs sound

3
modules/programs/gnome/default.nix
View File

@ -27,6 +27,9 @@ in {
gnomeExtensions.gsconnect
gnomeExtensions.blur-my-shell
gnomeExtensions.forge
gnomeExtensions.dash-to-dock
gnomeExtensions.sound-output-device-chooser
rounded-window-corners
# Programs
gnome.eog

6
packages/default.nix
View File

@ -73,7 +73,7 @@ in {
wlrootsqt = prev.libsForQt5.callPackage ./wlrootsqt.nix {};
qtgreet = prev.libsForQt5.callPackage ./qtgreet.nix {};
spice-gtk = prev.callPackage temp/spice-gtk/default.nix {};
#spice-gtk = prev.callPackage temp/spice-gtk/default.nix {};
discord-app = prev.callPackage applications/networking/instant-messengers/discord-app {
chromium = prev.ungoogled-chromium;
@ -89,7 +89,7 @@ in {
sddm-sugar-dark = prev.callPackage themes/sddm/sugar-dark {};
gamescope = prev.callPackage temp/gamescope.nix {};
custom-apparmor-utils = prev.callPackage temp/apparmor-utils.nix {};
authelia = prev.callPackage temp/authelia.nix {};
}