diff --git a/config/base.nix b/config/base.nix index 6cc2ded..25e9d42 100644 --- a/config/base.nix +++ b/config/base.nix @@ -50,8 +50,19 @@ liveRestore = false; }; + security.rtkit.enable = true; + services = { + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + }; + }; hardware = { - pulseaudio.enable = true; + pulseaudio.enable = false; bluetooth = { enable = true; powerOnBoot = true; @@ -64,12 +75,10 @@ }; networking.networkmanager.enable = true; - networking.nameservers = [ "8.8.8.8"]; - networking.resolvconf.enable = pkgs.lib.mkForce false; -networking.dhcpcd.extraConfig = "nohook resolv.conf"; -networking.networkmanager.dns = "none"; -services.resolved.enable = false; - + networking.nameservers = [ "8.8.8.8" ]; + # networking.resolvconf.enable = pkgs.lib.mkForce false; +# networking.dhcpcd.extraConfig = "nohook resolv.conf"; +# networking.networkmanager.dns = "none"; environment.sessionVariables = { EDITOR = "nvim"; diff --git a/config/home.nix b/config/home.nix index 8af7a0e..74c3364 100644 --- a/config/home.nix +++ b/config/home.nix @@ -11,8 +11,9 @@ imports = [ ../shared/dwm.nix ../shared/vscode.nix - ../shared/dmenu.nix + # ../shared/dmenu.nix ../shared/rofi.nix + ../shared/mpv.nix ../shared/kitty.nix ../shared/alacritty.nix ../shared/tmux.nix @@ -68,6 +69,7 @@ openssl dig jq + wireguard-tools # Dev unstable.deno @@ -93,7 +95,7 @@ kubectl #LSP - roslyn + # roslyn roslyn-ls python312Packages.python-lsp-server yaml-language-server @@ -101,13 +103,9 @@ jdt-language-server texlab marksman - nodePackages_latest.bash-language-server - typescript - nodePackages_latest.typescript-language-server - nodePackages_latest.vls - nodePackages_latest.volar - lua-language-server tree-sitter + vue-language-server + nodePackages_latest.typescript-language-server gopls rust-analyzer @@ -137,8 +135,8 @@ poppler_utils #Desktop + fluent-reader unstable.feishin - firefox libreoffice unstable.signal-desktop pinta @@ -146,7 +144,7 @@ vial thunderbird alacritty - unstable.neovim + neovim fastfetch lazygit byzanz diff --git a/config/lill-home.nix b/config/lill-home.nix index 768b1f4..ac3a4bc 100644 --- a/config/lill-home.nix +++ b/config/lill-home.nix @@ -128,7 +128,7 @@ zathura thunderbird alacritty - unstable.neovim + neovim fastfetch lazygit byzanz diff --git a/flake.nix b/flake.nix index 6fa0ad9..3dc581a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; fw-pkgs.url = "github:fwastring/fwpkgs/main"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/jobb/users.nix b/jobb/users.nix index 8ad67c7..56c6e3b 100644 --- a/jobb/users.nix +++ b/jobb/users.nix @@ -35,6 +35,14 @@ "docker" ]; }; + runner = { + initialPassword = "password"; + isNormalUser = true; + description = "github runner"; + extraGroups = [ + "docker" + ]; + }; }; }; } diff --git a/maskiner/work-desktop/configuration.nix b/maskiner/work-desktop/configuration.nix index 01744cb..aa27153 100644 --- a/maskiner/work-desktop/configuration.nix +++ b/maskiner/work-desktop/configuration.nix @@ -12,7 +12,8 @@ imports = [ ./hardware-configuration.nix ../../config/base.nix - ../../config/users.nix + ../../shared/openssh.nix + ../../jobb/users.nix ]; environment.systemPackages = with pkgs; [ diff --git a/shared/dwm.nix b/shared/dwm.nix index 8068cb4..82d182d 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -3,7 +3,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "05276318843d1bfe90a8aae266c9e997bf97e577"; + rev = "e298bf0dac111f928ef0fbd4a7ebc21db8782df5"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev diff --git a/shared/firefox.nix b/shared/firefox.nix index 2f98cf6..7682e22 100644 --- a/shared/firefox.nix +++ b/shared/firefox.nix @@ -9,7 +9,7 @@ builtins.fetchGit { url = "https://github.com/rockofox/firefox-minima"; ref = "main"; - rev = "c5580fd04e9b198320f79d441c78a641517d7af5"; # <-- Change this + rev = "dc40a861b24b378982c265a7769e3228ffccd45a"; # <-- Change this } }/userChrome.css"; ''; diff --git a/shared/kitty.nix b/shared/kitty.nix index d201ec8..23831bc 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -11,12 +11,12 @@ # name = "Iosevka Nerd Font Bold"; # name = "ComicShannsMono Nerd Font Bold"; name = "Hack Nerd Font Mono Bold"; - size = 13; + size = 12; }; shellIntegration = { mode = "no-cursor"; }; - theme = "Catppuccin-Mocha"; + themeFile = "Catppuccin-Mocha"; settings = { confirm_os_window_close = 2; cursor_shape = "block"; diff --git a/shared/ssh.nix b/shared/ssh.nix index f76f719..9811b93 100644 --- a/shared/ssh.nix +++ b/shared/ssh.nix @@ -86,6 +86,18 @@ user = "fw"; identityFile = "/home/fw/.ssh/id_rsa"; }; + "kube01" = { + hostname = "192.168.0.177"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/fw-ssh-key"; + }; + "runner01" = { + hostname = "192.168.0.205"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/fw-ssh-key"; + }; }; }; } diff --git a/shared/tmux.nix b/shared/tmux.nix index 1e42fcc..d48e1d9 100644 --- a/shared/tmux.nix +++ b/shared/tmux.nix @@ -7,16 +7,6 @@ tmuxPlugins.sensible tmuxPlugins.pain-control tmuxPlugins.sessionist - tmuxPlugins.logging - { - plugin = tmuxPlugins.resurrect; - extraConfig = '' - resurrect_dir="$HOME/.tmux/resurrect" - set -g @resurrect-dir $resurrect_dir - set -g @resurrect-hook-post-save-all 'target=$(readlink -f $resurrect_dir/last); sed "s| --cmd .*-vim-pack-dir||g; s|/etc/profiles/per-user/$USER/bin/||g" $target | sponge $target' - set -g @resurrect-strategy-nvim 'session' - ''; - } { plugin = tmuxPlugins.continuum; extraConfig = '' @@ -24,8 +14,6 @@ set -g @continuum-restore 'on' ''; } - fw-pkgs.tmuxPlugins.spotify - fw-pkgs.tmuxPlugins.tmux-fzf-window { plugin = fw-pkgs.tmuxPlugins.minimal; extraConfig = ''