Merge branch 'main' of ssh://git.ghoscht.com:2222/ghoscht/nix-config
This commit is contained in:
commit
6519189644
11 changed files with 167 additions and 49 deletions
60
flake.lock
60
flake.lock
|
@ -45,11 +45,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722825873,
|
||||
"narHash": "sha256-bFNXkD+s9NuidZePiJAjjFUnsMOwXb7hEZ4JEDdSALw=",
|
||||
"lastModified": 1729444465,
|
||||
"narHash": "sha256-+lCi3cQlFNGAGKaVeUNhTeR40zvMy9JX4hp1JA0dLwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "arion",
|
||||
"rev": "90bc85532767c785245f5c1e29ebfecb941cf8c9",
|
||||
"rev": "94d092fffd5cfd4f09b8988aca1b857a9d37c4d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -137,11 +137,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729281548,
|
||||
"narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
|
||||
"lastModified": 1730190761,
|
||||
"narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
|
||||
"rev": "3979285062d6781525cded0f6c4ff92e71376b55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -159,11 +159,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1729321532,
|
||||
"narHash": "sha256-3/d/mbLQhrkE1qK2Ut/mrMElE6fP9t6ITJoRQ6F+D7o=",
|
||||
"lastModified": 1730635639,
|
||||
"narHash": "sha256-B3PP5BGzu1PVb2e978uXj+7gWRJMHUAE5eUXxyHTxHQ=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "70087c8c6e491dcc0bbff459073b480b1a72ac1c",
|
||||
"rev": "178c79df993216cc9be02630d6cf42868b29f9c2",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
@ -340,11 +340,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728804768,
|
||||
"narHash": "sha256-WG8KWmT72SA1XrmixxJwI1RRWrT9D97kkYSE5OfOJdg=",
|
||||
"lastModified": 1730294700,
|
||||
"narHash": "sha256-piHI881ekHn14FEqwGyKkTEHTgXJrsKjX37gJFYx9G8=",
|
||||
"owner": "GermanBread",
|
||||
"repo": "declarative-flatpak",
|
||||
"rev": "42cc2c4d97a03889d551cc82c43a0b124fd403f6",
|
||||
"rev": "09b73f988d4a8376b81d0d22126bc8c2e039d36d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -378,11 +378,11 @@
|
|||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1728729581,
|
||||
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
|
||||
"lastModified": 1730537918,
|
||||
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
|
||||
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -778,11 +778,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1728156290,
|
||||
"narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
|
||||
"lastModified": 1730602179,
|
||||
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "17ae88b569bb15590549ff478bab6494dde4a907",
|
||||
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -794,11 +794,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1729070438,
|
||||
"narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
|
||||
"lastModified": 1730531603,
|
||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5785b6bb5eaae44e627d541023034e1601455827",
|
||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -954,11 +954,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"lastModified": 1730327045,
|
||||
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1002,11 +1002,11 @@
|
|||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1728093190,
|
||||
"narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=",
|
||||
"lastModified": 1730272153,
|
||||
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da",
|
||||
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1082,11 +1082,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728345710,
|
||||
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
|
||||
"lastModified": 1730605784,
|
||||
"narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
|
||||
"rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs.unstable; [
|
||||
(jetbrains.plugins.addPlugins jetbrains.idea-ultimate ["ideavim"])
|
||||
home.packages = [
|
||||
(pkgs.unstable.jetbrains.plugins.addPlugins pkgs.unstable.jetbrains.idea-ultimate ["ideavim"])
|
||||
];
|
||||
home.sessionVariables = {
|
||||
JAVA_HOME = "${pkgs.openjdk17}/lib/openjdk";
|
||||
LD_LIBRARY_PATH = "${pkgs.libGL}/lib:${pkgs.gtk3}/lib:${pkgs.glib.out}/lib:${pkgs.xorg.libXtst}/lib";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,107 @@
|
|||
{pkgs, ...}: {
|
||||
xdg.configFile."fcitx5" = {
|
||||
source = ../../../../rsc/config/fcitx5;
|
||||
recursive = true;
|
||||
# xdg.configFile."fcitx5" = {
|
||||
# source = ../../../../rsc/config/fcitx5;
|
||||
# recursive = true;
|
||||
# };
|
||||
xdg.configFile = {
|
||||
"fcitx5/config" = {
|
||||
force = true;
|
||||
text = ''
|
||||
[Hotkey]
|
||||
# Enumerate when press trigger key repeatedly
|
||||
EnumerateWithTriggerKeys=True
|
||||
# Temporally switch between first and current Input Method
|
||||
AltTriggerKeys=
|
||||
# Enumerate Input Method Forward
|
||||
EnumerateForwardKeys=
|
||||
# Enumerate Input Method Backward
|
||||
EnumerateBackwardKeys=
|
||||
# Skip first input method while enumerating
|
||||
EnumerateSkipFirst=False
|
||||
# Enumerate Input Method Group Forward
|
||||
EnumerateGroupForwardKeys=
|
||||
# Enumerate Input Method Group Backward
|
||||
EnumerateGroupBackwardKeys=
|
||||
# Activate Input Method
|
||||
ActivateKeys=
|
||||
# Deactivate Input Method
|
||||
DeactivateKeys=
|
||||
# Default Previous page
|
||||
PrevPage=
|
||||
# Default Next page
|
||||
NextPage=
|
||||
# Default Previous Candidate
|
||||
PrevCandidate=
|
||||
# Default Next Candidate
|
||||
NextCandidate=
|
||||
# Toggle embedded preedit
|
||||
TogglePreedit=
|
||||
|
||||
[Hotkey/TriggerKeys]
|
||||
0=Control+Alt+space
|
||||
|
||||
[Behavior]
|
||||
# Active By Default
|
||||
ActiveByDefault=False
|
||||
# Share Input State
|
||||
ShareInputState=No
|
||||
# Show preedit in application
|
||||
PreeditEnabledByDefault=True
|
||||
# Show Input Method Information when switch input method
|
||||
ShowInputMethodInformation=True
|
||||
# Show Input Method Information when changing focus
|
||||
showInputMethodInformationWhenFocusIn=False
|
||||
# Show compact input method information
|
||||
CompactInputMethodInformation=True
|
||||
# Show first input method information
|
||||
ShowFirstInputMethodInformation=True
|
||||
# Default page size
|
||||
DefaultPageSize=5
|
||||
# Override Xkb Option
|
||||
OverrideXkbOption=False
|
||||
# Custom Xkb Option
|
||||
CustomXkbOption=
|
||||
# Force Enabled Addons
|
||||
EnabledAddons=
|
||||
# Force Disabled Addons
|
||||
DisabledAddons=
|
||||
# Preload input method to be used by default
|
||||
PreloadInputMethod=True
|
||||
# Allow input method in the password field
|
||||
AllowInputMethodForPassword=False
|
||||
# Show preedit text when typing password
|
||||
ShowPreeditForPassword=False
|
||||
# Interval of saving user data in minutes
|
||||
AutoSavePeriod=30
|
||||
'';
|
||||
};
|
||||
|
||||
"fcitx5/profile" = {
|
||||
force = true;
|
||||
text = ''
|
||||
[Groups/0]
|
||||
# Group Name
|
||||
Name="Group 1"
|
||||
# Layout
|
||||
Default Layout=de
|
||||
# Default Input Method
|
||||
DefaultIM=mozc
|
||||
|
||||
[Groups/0/Items/0]
|
||||
# Name
|
||||
Name=keyboard-de
|
||||
# Layout
|
||||
Layout=
|
||||
|
||||
[Groups/0/Items/1]
|
||||
# Name
|
||||
Name=mozc
|
||||
# Layout
|
||||
Layout=
|
||||
|
||||
[GroupOrder]
|
||||
0="Group 1"
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
arkenfox = {
|
||||
enable = true;
|
||||
version = "119.0";
|
||||
version = "128.0";
|
||||
};
|
||||
|
||||
profiles.Default = {
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
vars,
|
||||
...
|
||||
}: {
|
||||
{inputs, ...}: {
|
||||
imports = [inputs.flatpaks.homeManagerModules.default];
|
||||
services.flatpak = {
|
||||
remotes.flathub = "https://flathub.org/repo/flathub.flatpakrepo";
|
||||
|
@ -11,6 +6,7 @@
|
|||
"flathub:app/us.zoom.Zoom//stable"
|
||||
"flathub:app/com.discordapp.Discord//stable"
|
||||
"flathub:app/md.obsidian.Obsidian//stable"
|
||||
"flathub:app/com.github.iwalton3.jellyfin-media-player//stable"
|
||||
];
|
||||
overrides = {
|
||||
global = {
|
||||
|
@ -27,6 +23,11 @@
|
|||
"system-bus"
|
||||
];
|
||||
};
|
||||
"com.github.iwalton3.jellyfin-media-player" = {
|
||||
environment = {
|
||||
QT_XCB_GL_INTEGRATION = "xcb_egl";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "gtk";
|
||||
platformTheme.name = "gtk";
|
||||
style.package = with pkgs; [adwaita-qt adwaita-qt6];
|
||||
style.name = "adwaita-dark";
|
||||
};
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
{
|
||||
inputs,
|
||||
outputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# You can import other NixOS modules here
|
||||
|
@ -11,8 +12,8 @@
|
|||
# outputs.nixosModules.example
|
||||
|
||||
# Or modules from other flakes (such as nixos-hardware):
|
||||
inputs.hardware.nixosModules.common-cpu-amd
|
||||
inputs.hardware.nixosModules.common-gpu-nvidia
|
||||
inputs.hardware.nixosModules.common-cpu-amd-pstate
|
||||
inputs.hardware.nixosModules.common-gpu-nvidia-nonprime
|
||||
inputs.hardware.nixosModules.common-pc-ssd
|
||||
|
||||
# You can also split up your configuration and import pieces of it here:
|
||||
|
@ -59,21 +60,27 @@
|
|||
# Disable if you don't want unfree packages
|
||||
allowUnfree = true;
|
||||
firefox.enablePlasmaBrowserIntegration = true;
|
||||
segger-jlink.acceptLicense = true;
|
||||
permittedInsecurePackages = ["segger-jlink-qt4-794l"];
|
||||
};
|
||||
};
|
||||
|
||||
networking.hostName = "adalbert";
|
||||
|
||||
services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default];
|
||||
services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default pkgs.segger-jlink];
|
||||
environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default];
|
||||
|
||||
# Personalausweis reader
|
||||
programs.ausweisapp.enable = true;
|
||||
programs.ausweisapp.openFirewall = true; # also sets firewall entry
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
# services.xserver.displayManager.sddm.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
|
||||
# Force disable Nvidia PRIME, needed by nix-hardware
|
||||
hardware.nvidia.prime.offload.enable = false;
|
||||
# hardware.nvidia.prime.offload.enable = false;
|
||||
|
||||
programs.coolercontrol = {
|
||||
enable = true;
|
||||
|
|
|
@ -34,12 +34,12 @@
|
|||
(with pkgs; [
|
||||
# Ignored Packages
|
||||
gnome-tour
|
||||
gedit
|
||||
])
|
||||
++ (with pkgs.gnome; [
|
||||
atomix
|
||||
epiphany
|
||||
geary
|
||||
gedit
|
||||
gnome-characters
|
||||
gnome-contacts
|
||||
gnome-initial-setup
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
fcitx5-mozc
|
||||
fcitx5-gtk
|
||||
];
|
||||
fcitx5.waylandFrontend = true;
|
||||
};
|
||||
fonts.packages = with pkgs; [
|
||||
noto-fonts-cjk-sans
|
||||
|
|
|
@ -58,11 +58,15 @@
|
|||
config = {
|
||||
# Disable if you don't want unfree packages
|
||||
allowUnfree = true;
|
||||
segger-jlink.acceptLicense = true;
|
||||
permittedInsecurePackages = ["segger-jlink-qt4-794l"];
|
||||
};
|
||||
};
|
||||
|
||||
networking.hostName = "ludwig";
|
||||
|
||||
services.udev.packages = [pkgs.segger-jlink];
|
||||
|
||||
# environment.sessionVariables.QT_QPA_PLATFORM = "wayland";
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
programs = {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
local autostart = {}
|
||||
|
||||
function autostart.exec(awful)
|
||||
awful.spawn.with_shell("picom --backend glx --xrender-sync-fence --vsync")
|
||||
-- awful.spawn.with_shell("picom --backend glx --xrender-sync-fence --vsync")
|
||||
-- awful.spawn.with_shell("nitrogen --restore")
|
||||
awful.spawn.with_shell("redshift -x &&redshift -O 3500")
|
||||
-- awful.spawn.with_shell("/usr/lib/polkit-kde-authentication-agent-1")
|
||||
|
|
Loading…
Reference in a new issue