diff --git a/configuration.nix b/configuration.nix index d620d31..d0d038b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -110,7 +110,7 @@ firefox alacritty git - thunderbird + thunderbird-91 okular texlive.combined.scheme-full rustup @@ -120,6 +120,8 @@ clang keepassxc gnome.libsecret + arandr + rnix-lsp ]; diff --git a/home/config/i3/config b/home/config/i3/config index 10c2013..75b7ecc 100644 --- a/home/config/i3/config +++ b/home/config/i3/config @@ -123,7 +123,7 @@ bindsym $mod+a focus parent # Define names for default workspaces for which we configure key bindings later on. # We use variables to avoid repeating the names in multiple places. -set $ws1 "1 :gen" +set $ws1 "1: gen" set $ws2 "2: web" set $ws3 "3: misc" set $ws4 "4: comms" @@ -233,6 +233,10 @@ bindsym Mod1+space exec --no-startup-id .config/i3/keyboard_layout_toggle.sh # autostart keepassxc exec --no-startup-id .config/i3/keepassxc.sh +# autostart other stuff +exec --no-startup-id i3-msg 'workspace 4: comms; exec signal-desktop' +exec --no-startup-id i3-msg 'workspace 4: comms; exec element-desktop' + # application specific stuff for_window[class="KeePassXC"] floating enable #assign [class="KeePassXC"] $ws5 diff --git a/home/config/nixpkgs/autorandr.nix b/home/config/nixpkgs/autorandr.nix index 16437ce..ab9016c 100644 --- a/home/config/nixpkgs/autorandr.nix +++ b/home/config/nixpkgs/autorandr.nix @@ -16,6 +16,7 @@ primary = true; position = "0x0"; mode = "3840x2160"; + dpi = 96; }; }; }; @@ -26,6 +27,29 @@ enable = true; primary = true; mode = "3840x2160"; + dpi = 288; + }; + }; + }; + "work" = { + fingerprint = { + eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006"; + DP-2 = "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9"; + }; + config = { + eDP-1 = { + enable = true; + crtc = 0; + position = "3840x0"; + mode = "3840x2160"; + dpi = 288; + }; + DP-2 = { + enable = true; + primary = true; + mode = "3840x2160"; + dpi = 144; + position = "0x0"; }; }; }; diff --git a/machine/stel-xps/default.nix b/machine/stel-xps/default.nix index 92ff5ed..c8bd97f 100644 --- a/machine/stel-xps/default.nix +++ b/machine/stel-xps/default.nix @@ -2,6 +2,10 @@ { networking.hostName = "stel-xps"; # define the hostname + environment.systemPackages = with pkgs; [ + brightnessctl + ]; + services.autorandr.enable = true; services.xserver.desktopManager.wallpaper.mode = "fill"; } diff --git a/cp.sh b/to_git.sh similarity index 100% rename from cp.sh rename to to_git.sh diff --git a/to_system.sh b/to_system.sh new file mode 100644 index 0000000..388a8d8 --- /dev/null +++ b/to_system.sh @@ -0,0 +1,12 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i zsh -p zsh + + +cp configuration.nix /etc/nixos/. +cp -r programs /etc/nixos/. +mkdir -p /etc/nixos/machine +for machine in `exa --all -l machine | grep "^d" | cut -d" " -f8`; do + cp -r machine/$machine /etc/nixos/machine/. +done + +cp -r ./home/config/* $HOME/.config/.