albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Update README

Browse source
This commit is contained in:
albert 2024-06-24 12:55:17 +09:00
parent 1c9b3c8fab
commit 7dd109fa49
Signed by: albert
GPG key ID: 3895DD267CA11BA9
7 changed files with 56 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -49,9 +49,11 @@ nix develop -c /etc/nixos/git/docs/setup.sh
--- ---
# 📋 To Do List # 📋 To Do List
* [ ] Revert to 24.05 and not unstable * [x] Revert to 24.05 and not unstable
* Currently seeing issues with the ssh-to-pgp package. * Currently seeing issues with the ssh-to-pgp package.
* Maybe find a way to pull it from 24.05 temporarily * Maybe find a way to pull it from 24.05 temporarily
* [ ] Add audio to rdesktop xrdp config
* [ ] Framework volume buttons don't work on KDE
## home-manager ## home-manager
* [ ] Find a way to remove all default search engines in Firefox (Google, Amazon, etc) * [ ] Find a way to remove all default search engines in Firefox (Google, Amazon, etc)

69
flake.lock
View file

@ -776,15 +776,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719037157, "lastModified": 1718530513,
"narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -892,11 +893,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1719093162, "lastModified": 1719164993,
"narHash": "sha256-WA48JNc8e3Irz0gpSE/vby67RlC+m+MJlQ6sZQId1EI=", "narHash": "sha256-yfDdjbR7Mgwk0c4MQNLHQbPUOXyp07yxsyTYrvLWjGA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "7f09646ab8b5b6d9f835681d0af5d7a0dc29d8f1", "rev": "8a68199a0ceb2894a5d9cc300961c38123ac0312",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1062,11 +1063,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1718539824, "lastModified": 1719144654,
"narHash": "sha256-pVGgM3MOOpMMqprkrMkuWwhC1dsw6Xt7aRGaBkMQqG0=", "narHash": "sha256-3eKm5xwc2M4WJ1wQ4POID8jpDARWXEAMcuh1xDItJl8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "17a1c1bfca963a2776969866aaa07744d7ac9135", "rev": "7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1104,11 +1105,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1719073535, "lastModified": 1719174496,
"narHash": "sha256-G3LQrKVR5J31hpM8iFMHPchj7HRu0hcLarqLAyRALsI=", "narHash": "sha256-B9xJfKbmu9WOHMusgCaJokT0ATN0CXP/pC8op1XPJTA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "630134d3ee9f33caef30b658537463053e9cfde2", "rev": "413e7df4eefc03bfd019f797939d277305d789f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1215,11 +1216,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719069430, "lastModified": 1719145664,
"narHash": "sha256-d9KzCJv3UG6nX9Aur5OSEf4Uj+ywuxojhiCiRKYVzXA=", "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e8232c132a95ddc62df9d404120ad4ff53862910", "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1246,11 +1247,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1718499101, "lastModified": 1719103869,
"narHash": "sha256-2oGRKxl3qEyRH2DJRiVtLeJICcybXMkqjWQYODINL9M=", "narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "6fba0c5a27b984914794ffdab8d7bb5c29ab11b6", "rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1314,11 +1315,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1719131785, "lastModified": 1719174979,
"narHash": "sha256-tfJKV1mwjqbwQI/JBmPyKSk3+RGN2SymxH/RiJIJnZU=", "narHash": "sha256-56fpwnm9kEN1EwWP/QK5vrVKprGqB8P1nykzNwU+njY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "791480b98714d4488a7bea8b91453c8546d18d8e", "rev": "3c5a40d3dd8e1383b027570b27514aef09b85bd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1361,16 +1362,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1718835956,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -1497,11 +1498,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1719130969, "lastModified": 1719180650,
"narHash": "sha256-U+a/N3m0tg36KD/SjGyveV5hx8VYSnFHiKRjlt+iyL4=", "narHash": "sha256-KqAz2NpqjotMTi+54S27B36/P9576t6ol1OO91F7kpA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "88407857c90e39f2654a0ef347c2c920c25f453c", "rev": "c35808fdf00eac21e675b7ec691f623fe0653553",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1598,11 +1599,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719082099, "lastModified": 1719145147,
"narHash": "sha256-Ga2Yi3rebXGk7ybFlwrkbs2jee364dmmbsvcVWU20ic=", "narHash": "sha256-Es/sgvSvVzv3DfWcl3OMABIuBUWiYXx2uwT94hQO4Io=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "675d5fc9cd4dcfe0fc94d0fc4cb38a27fff595b0", "rev": "5db39ce2fa95f4dfe1bdfe371fd9a90c65b3a9a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1767,11 +1768,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1718971834, "lastModified": 1719152448,
"narHash": "sha256-k+BjPJgjmG+u8VwyzjA6YxkoBn9tP1m19h0CQGc3iGM=", "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "97dcf3c216fe5fb19c406e39f265d3bc9b851377", "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -2,11 +2,11 @@
description = "NixOS System Config"; description = "NixOS System Config";
inputs = { inputs = {
# Stable Packages # Stable Packages
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-24.05";
# Unstable Packages # Unstable Packages
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
# home-manager - Dotfile mnagement - add /master at the end to pull from master # home-manager - Dotfile mnagement - add /master at the end to pull from master
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Nix colorizer / themer # Nix colorizer / themer
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";

6
nixos/common/modules/hosts.nix
View file

@ -55,11 +55,6 @@ let
sha256 = "19aebdc75324179473cb0f192570c19559c1486ae7a4620191d0af1e31769025"; sha256 = "19aebdc75324179473cb0f192570c19559c1486ae7a4620191d0af1e31769025";
}); });
Basic = builtins.readFile(builtins.fetchurl {
url = "https://github.com/blocklistproject/Lists/raw/f2bdd1deab05f6a22739671cc20a17444e53699f/basic.txt";
sha256 = "1d778ada1a5fa8758aab0950a2a6750463b88dd67e0d54702bc37d63a77d2d51";
});
in { in {
networking.extraHosts = lib.mkMerge [ networking.extraHosts = lib.mkMerge [
Twitter Twitter
@ -73,6 +68,5 @@ in {
Scam Scam
Abuse Abuse
Ads Ads
Basic
]; ];
} }

7
nixos/hosts/nixos-desktop/default.nix
View file

@ -46,7 +46,12 @@
}; };
hardware = { hardware = {
graphics.enable = true; opengl = {
enable = true;
driSupport32Bit = true;
driSupport = true;
};
nvidia = { nvidia = {
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;

9
nixos/hosts/nixos-framework/default.nix
View file

@ -41,7 +41,14 @@
# Set the networking hostname: # Set the networking hostname:
networking.hostName = "nixos-framework"; networking.hostName = "nixos-framework";
hardware.graphics.enable = true; hardware = {
opengl = {
enable = true;
driSupport32Bit = true;
driSupport = true;
};
};
programs.gamemode = { programs.gamemode = {
enable = true; enable = true;

4
nixos/hosts/steamdeck/default.nix
View file

@ -1,4 +1,4 @@
{ inputs, config, lib, username, pkgs, ... }: { { inputs, config, lib, username, hostname, pkgs, ... }: {
imports = [ imports = [
inputs.jovian.nixosModules.default inputs.jovian.nixosModules.default
./disks.nix ./disks.nix
@ -20,7 +20,7 @@
# Set your time zone. # Set your time zone.
time.timeZone = "Asia/Tokyo"; time.timeZone = "Asia/Tokyo";
# Set the networking hostname: # Set the networking hostname:
networking.hostName = "steamdeck"; networking.hostName = hostname;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
python3 # decky-loader required python3 # decky-loader required