jsw/NiksOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small changes

Browse source
This commit is contained in:
Jurn Wubben 2025-05-20 23:16:16 +02:00
parent aa3c25284d
commit 562a8b7a2e
8 changed files with 156 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

154
flake.lock generated
View file

@ -233,7 +233,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@ -251,7 +251,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
@ -268,6 +268,24 @@
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": [
"stylix",
@ -369,6 +387,26 @@
"type": "github"
}
},
"guiders": {
"inputs": {
"flake-utils": "flake-utils",
"naersk": "naersk",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1746821859,
"narHash": "sha256-y75tKjVBuMdERCx0V2Vqq3F0r55UaDeghUYrSBIqhag=",
"owner": "jsw08",
"repo": "guiders",
"rev": "8abe71a5b71739c6b4a9bb3efc244e796a8b9878",
"type": "github"
},
"original": {
"owner": "jsw08",
"repo": "guiders",
"type": "github"
}
},
"hm": {
"inputs": {
"nixpkgs": [
@ -449,7 +487,25 @@
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1745925850,
"narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=",
"owner": "nix-community",
"repo": "naersk",
"rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"naersk_2": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1739824009,
@ -494,8 +550,8 @@
"nixcord": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs",
"systems": "systems_2",
"nixpkgs": "nixpkgs_3",
"systems": "systems_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -514,11 +570,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1744868846,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
"lastModified": 1746397377,
"narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
"rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8",
"type": "github"
},
"original": {
@ -575,6 +631,38 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1746397377,
"narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1744868846,
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1746328495,
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
@ -590,7 +678,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_5": {
"locked": {
"lastModified": 1741516043,
"narHash": "sha256-Hv0S630U4GVZBM1Q+NCEwyN5ct7cic+8r6qLIaUaVqI=",
@ -603,7 +691,7 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"nixpkgs_6": {
"locked": {
"lastModified": 1742707865,
"narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=",
@ -619,7 +707,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_7": {
"locked": {
"lastModified": 1745930157,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
@ -661,13 +749,13 @@
"nvf": {
"inputs": {
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"mnw": "mnw",
"nil": "nil",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_4"
"systems": "systems_5"
},
"locked": {
"lastModified": 1746522393,
@ -688,9 +776,10 @@
"agenix": "agenix",
"dcbot": "dcbot",
"flake-parts": "flake-parts",
"guiders": "guiders",
"hm": "hm",
"nixcord": "nixcord",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable",
"nvf": "nvf",
"somcli": "somcli",
@ -721,9 +810,9 @@
},
"somcli": {
"inputs": {
"flake-utils": "flake-utils_2",
"naersk": "naersk",
"nixpkgs": "nixpkgs_4"
"flake-utils": "flake-utils_3",
"naersk": "naersk_2",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1746534525,
@ -747,13 +836,13 @@
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_4",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_7",
"nur": "nur",
"systems": "systems_6",
"systems": "systems_7",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@ -799,8 +888,9 @@
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
@ -813,9 +903,8 @@
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
"id": "systems",
"type": "indirect"
}
},
"systems_4": {
@ -863,6 +952,21 @@
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {

1
flake.nix
View file

@ -51,6 +51,7 @@
nixcord.url = "github:kaylorben/nixcord";
somcli.url = "github:jsw08/somcli";
guiders.url = "github:jsw08/guiders";
# Non-flake
dcbot = {

39
home/programs/games.nix
View file

@ -3,24 +3,27 @@
osConfig,
lib,
...
}: {
}: let
inherit (osConfig.niksos) games bluetooth;
in {
# Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.)
home.packages = lib.mkIf osConfig.niksos.games [
pkgs.dolphin-emu
pkgs.suyu
pkgs.gale
pkgs.adwsteamgtk
home.packages = lib.mkIf games ([
pkgs.dolphin-emu
pkgs.suyu
pkgs.gale
pkgs.adwsteamgtk
# (
# pkgs.appimageTools.wrapType1 rec {
# pname = "nx-optimizer";
# version = "3.0.1";
#
# src = pkgs.fetchurl {
# url = "https://github.com/MaxLastBreath/TOTK-mods/releases/download/manager-3.0.1/NX.Optimizer.3.0.1.AppImage";
# hash = "sha256-2InXpoLm4bfuj0FYRXruRxggBA/E6XiJFeuNbyAMk5s=";
# };
# }
# )
];
# (
# pkgs.appimageTools.wrapType1 rec {
# pname = "nx-optimizer";
# version = "3.0.1";
#
# src = pkgs.fetchurl {
# url = "https://github.com/MaxLastBreath/TOTK-mods/releases/download/manager-3.0.1/NX.Optimizer.3.0.1.AppImage";
# hash = "sha256-2InXpoLm4bfuj0FYRXruRxggBA/E6XiJFeuNbyAMk5s=";
# };
# }
# )
]
++ lib.optional bluetooth pkgs.dualsensectl);
}

1
home/programs/neovim.nix
View file

@ -5,6 +5,7 @@
}: {
imports = [inputs.nvf.homeManagerModules.default];
home.sessionVariables = {EDITOR = "nvim";};
programs.nvf = {
enable = osConfig.niksos.neovim;
settings.vim = {

1
home/shell/other.nix
View file

@ -22,6 +22,7 @@
inputs.somcli.defaultPackage.${pkgs.system}
pkgs.ffmpeg
pkgs.gurk-rs
pkgs.playerctl
]
++ lib.optionals osConfig.niksos.bluetooth [
pkgs.ear2ctl

3
home/wayland/hyprland/settings.nix
View file

@ -89,8 +89,7 @@
vrr = 1;
};
windowrulev2 = [
# FIXME: change to `windowrule` after hyprland update.
windowrule = [
"float, class:com.github.phase1geo.annotator"
"float, class:foot-somcli"
"size >30% >30%, class:foot-somcli"

1
hosts/laptop/default.nix
View file

@ -19,6 +19,7 @@ in {
desktop = true;
portable = true;
neovim = true;
kde = true;
};
home-manager.users.jsw.wayland.windowManager.hyprland.settings.monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"];

1
system/core/defaultPackages.nix
View file

@ -7,4 +7,5 @@
pkgs.neovim
inputs.agenix.packages.${pkgs.system}.default
]; # Still have to be able to edit configs.
environment.sessionVariables = {EDITOR = "nvim";};
}