From 1030d3e37fadfd0903fc9452f6f51fb53f047bee Mon Sep 17 00:00:00 2001 From: Kenryu Shibata Date: Sat, 21 Dec 2024 00:05:36 +0900 Subject: [PATCH] update --- flake.lock | 18 +++++++++--------- machines/workstation/configuration.nix | 2 +- machines/workstation/home.nix | 7 +++++-- system/hardware/audio.nix | 7 ++++++- system/hardware/inputMethods.nix | 5 ++++- system/services/podman.nix | 2 +- user/apps/media/kdenlive.nix | 6 ++++++ user/apps/media/obs-studio.nix | 6 ++++++ user/apps/office/libreoffice-fresh.nix | 6 ++++++ user/dev/lang/ecmascript.nix | 2 +- user/dev/tools/gh.nix | 6 ++++++ user/shell/bash.nix | 4 ++++ user/wm/xmonad/xmonad.hs | 5 +---- 13 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 user/apps/media/kdenlive.nix create mode 100644 user/apps/media/obs-studio.nix create mode 100644 user/apps/office/libreoffice-fresh.nix create mode 100644 user/dev/tools/gh.nix diff --git a/flake.lock b/flake.lock index bc62bc5..cee297d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { diff --git a/machines/workstation/configuration.nix b/machines/workstation/configuration.nix index 61226b2..7e4aa3c 100644 --- a/machines/workstation/configuration.nix +++ b/machines/workstation/configuration.nix @@ -32,7 +32,7 @@ }; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 3000 3001 ]; + networking.firewall.allowedTCPPorts = [ 3000 3001 22 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/machines/workstation/home.nix b/machines/workstation/home.nix index 38e3fdc..3380278 100644 --- a/machines/workstation/home.nix +++ b/machines/workstation/home.nix @@ -9,6 +9,7 @@ ../../user/dev/tools/firefox-devedition.nix ../../user/dev/tools/dbeaver-bin.nix ../../user/dev/tools/tldr.nix + ../../user/dev/tools/gh.nix ../../user/dev/editor/vscodium.nix ../../user/dev/editor/zed-editor.nix ../../user/dev/lang/cc.nix @@ -18,18 +19,20 @@ ../../user/dev/ide/qtcreator.nix ../../user/apps/utils/alacritty.nix ../../user/apps/utils/keepassxc.nix - ../../user/apps/utils/cava.nix + #../../user/apps/utils/cava.nix ../../user/apps/utils/owncloud-client.nix ../../user/apps/utils/fzf.nix ../../user/apps/utils/zoxide.nix ../../user/apps/media/vlc.nix ../../user/apps/media/mpv.nix ../../user/apps/media/yt-dlp.nix + ../../user/apps/media/kdenlive.nix + ../../user/apps/media/obs-studio.nix ../../user/apps/graphics/gimp.nix ../../user/apps/graphics/inkscape.nix ../../user/apps/games/mangohud.nix - ../../user/apps/games/minecraft.nix ../../user/apps/office/texlive.nix + #../../user/apps/office/libreoffice-fresh.nix ../../user/shell/bash.nix ../../user/wm/xmonad/xmonad.nix ]; diff --git a/system/hardware/audio.nix b/system/hardware/audio.nix index fa3ebc3..8d84865 100644 --- a/system/hardware/audio.nix +++ b/system/hardware/audio.nix @@ -1,6 +1,11 @@ { ... }: { - #hardware.pulseaudio.enable = true; + hardware.pulseaudio = { + support32Bit = true; + daemon.config = { + flat-volumes = "yes"; + }; + }; security.rtkit.enable = true; services.pipewire = { diff --git a/system/hardware/inputMethods.nix b/system/hardware/inputMethods.nix index 1597553..5bdf445 100644 --- a/system/hardware/inputMethods.nix +++ b/system/hardware/inputMethods.nix @@ -7,7 +7,10 @@ fcitx5 = { waylandFrontend = true; plasma6Support = true; - addons = with pkgs; [ fcitx5-mozc fcitx5-skk ]; + addons = with pkgs; [ + #fcitx5-mozc + fcitx5-skk + ]; }; }; }; diff --git a/system/services/podman.nix b/system/services/podman.nix index 2572883..0340d5d 100644 --- a/system/services/podman.nix +++ b/system/services/podman.nix @@ -16,5 +16,5 @@ podman-compose ]; - hardware.nvidia-container-toolkit.enable = lib.lists.elem "nvidia" config.services.xserver.videoDrivers; + hardware.nvidia-container-toolkit.enable = true; } diff --git a/user/apps/media/kdenlive.nix b/user/apps/media/kdenlive.nix new file mode 100644 index 0000000..885e70d --- /dev/null +++ b/user/apps/media/kdenlive.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + kdenlive + ]; +} diff --git a/user/apps/media/obs-studio.nix b/user/apps/media/obs-studio.nix new file mode 100644 index 0000000..4f97d02 --- /dev/null +++ b/user/apps/media/obs-studio.nix @@ -0,0 +1,6 @@ +{ config, pkgs, libs, ... }: +{ + home.packages = with pkgs; [ + obs-studio + ]; +} diff --git a/user/apps/office/libreoffice-fresh.nix b/user/apps/office/libreoffice-fresh.nix new file mode 100644 index 0000000..2b9c206 --- /dev/null +++ b/user/apps/office/libreoffice-fresh.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + libreoffice-fresh + ]; +} diff --git a/user/dev/lang/ecmascript.nix b/user/dev/lang/ecmascript.nix index 54e1d04..1c3168c 100644 --- a/user/dev/lang/ecmascript.nix +++ b/user/dev/lang/ecmascript.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { home.packages = with pkgs; [ - nodejs_20 + nodejs_22 ]; } diff --git a/user/dev/tools/gh.nix b/user/dev/tools/gh.nix new file mode 100644 index 0000000..063021c --- /dev/null +++ b/user/dev/tools/gh.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + gh + ]; +} diff --git a/user/shell/bash.nix b/user/shell/bash.nix index 97f0ec4..6d9c276 100644 --- a/user/shell/bash.nix +++ b/user/shell/bash.nix @@ -17,5 +17,9 @@ in l = lsCmd; ls = lsCmd; }; + bashrcExtra = '' + eval "$(fzf --bash)" + eval "$(zoxide init bash)" + ''; }; } diff --git a/user/wm/xmonad/xmonad.hs b/user/wm/xmonad/xmonad.hs index d80c4fd..4d822a7 100644 --- a/user/wm/xmonad/xmonad.hs +++ b/user/wm/xmonad/xmonad.hs @@ -64,10 +64,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) -- launch dmenu - , ((modm, xK_p ), spawn "dmenu_run") - - -- launch gmrun - , ((modm .|. shiftMask, xK_p ), spawn "gmrun") + , ((modm, xK_p ), spawn "rofi -show drun") -- close focused window , ((modm .|. shiftMask, xK_c ), kill)